| commit | 9c5e00a07be8edbf55aef80def6698ef220e4501 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Fri Aug 23 18:47:27 2013 -0700 |
| committer | Ying Wang <wangying@google.com> | Fri Aug 23 18:47:27 2013 -0700 |
| tree | 986a22630c24b2cf837e0bac28c4266085470cac | |
| parent | 2f2f829649df2722740692c14a3d929ab1a36f45 [diff] |
Fix cts build. Change-Id: I3916d78075b0465a31c7abbfa718dc619ebe79fc
diff --git a/build/test_gtest_package.mk b/build/test_gtest_package.mk index 2f4c9bb..6ecd798 100644 --- a/build/test_gtest_package.mk +++ b/build/test_gtest_package.mk
@@ -21,6 +21,7 @@ # Disable by default so "m cts" will work in emulator builds LOCAL_DEX_PREOPT := false +LOCAL_PROGUARD_ENABLED := disabled include $(BUILD_PACKAGE)
diff --git a/tests/ProcessTest/Android.mk b/tests/ProcessTest/Android.mk index 4f23fac..a2958fe 100644 --- a/tests/ProcessTest/Android.mk +++ b/tests/ProcessTest/Android.mk
@@ -29,6 +29,7 @@ LOCAL_PACKAGE_NAME := ProcessTests LOCAL_DEX_PREOPT := false +LOCAL_PROGUARD_ENABLED := disabled include $(BUILD_PACKAGE)
diff --git a/tools/device-setup/TestDeviceSetup/Android.mk b/tools/device-setup/TestDeviceSetup/Android.mk index efa50bf..39f989e 100644 --- a/tools/device-setup/TestDeviceSetup/Android.mk +++ b/tools/device-setup/TestDeviceSetup/Android.mk
@@ -23,6 +23,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) # and because it is in data, do not strip classes.dex LOCAL_DEX_PREOPT := false +LOCAL_PROGUARD_ENABLED := disabled LOCAL_JAVA_LIBRARIES := android.test.runner