From 52eceb5460483e51fbb0c1ac7b8c309a80564edd Mon Sep 17 00:00:00 2001 From: Jonathan Pryor Date: Mon, 2 Feb 2015 15:19:02 -0500 Subject: [PATCH] [System.Core/Android] Update TimeZone database self test. The `make tzi.exe` target had bitrotted, and the `make android-dump-tzdata` target generated inadvertent/unintentional errors. Fix the makefile so that things build and run. --- mcs/class/System.Core/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mcs/class/System.Core/Makefile b/mcs/class/System.Core/Makefile index 3480ca91098..85be511bd32 100644 --- a/mcs/class/System.Core/Makefile +++ b/mcs/class/System.Core/Makefile @@ -79,7 +79,7 @@ endif # tzi.exe: ../corlib/System/AndroidPlatform.cs $(wildcard System/TimeZone*.cs) ../../build/common/Consts.cs ../Mono.Options/Mono.Options/Options.cs - mcs /debug+ /out:$@ /unsafe "/d:INSIDE_CORLIB;MONODROID;NET_4_0;LIBC;SELF_TEST" $^ + mcs /debug+ /out:$@ /unsafe "/d:INSIDE_CORLIB;MONODROID;MOBILE;NET_4_5;NET_4_0;LIBC;SELF_TEST" $^ android-pull-tzdb: mkdir -p android/tzdb/usr/share/zoneinfo @@ -88,7 +88,6 @@ android-pull-tzdb: android_data=`adb shell echo '$$ANDROID_DATA' | tr -d "\r"` ; \ adb $(ADB_TARGET) pull $$android_root/usr/share/zoneinfo android/tzdb/usr/share/zoneinfo ; \ adb $(ADB_TARGET) pull $$android_data/misc/zoneinfo/tzdata android/tzdb/misc/zoneinfo - mkdir -p android/tzdb/ android-dump-tzdata: tzi.exe android-pull-tzdb - __XA_OVERRIDE_TIMEZONE_ID__=America/New_York ANDROID_ROOT=`pwd` ANDROID_DATA=`pwd` mono --debug tzi.exe -o android/tzdata + __XA_OVERRIDE_TIMEZONE_ID__=America/New_York ANDROID_ROOT="`pwd`/android/tzdb" ANDROID_DATA="`pwd`/android/tzdb" mono --debug tzi.exe -o android/tzdata -- 2.25.1