diff options
author | Yohann Roussel <yroussel@google.com> | 2018-02-01 20:17:05 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-02-01 20:17:05 +0000 |
commit | 970a20d7497d347677a20c52e6454194c6b4c45f (patch) | |
tree | 04cdb98d71386c673a6b04d1e1ccf60e21423081 | |
parent | 89941e09c6ec5cdb7c18a11b2b1d38ff9862d78f (diff) | |
parent | 6e979de7e80bdab27a9a396bb7204f0f7d475362 (diff) | |
download | dalvik-970a20d7497d347677a20c52e6454194c6b4c45f.tar.gz |
Merge "Build shrinkedAndroid.jar from SDK 20 API"
am: 6e979de7e8
Change-Id: I1f9ed5b72b8d7a505b1e2e885adb5310b1668b44
-rw-r--r-- | dx/Android.mk | 2 | ||||
-rw-r--r-- | dx/shrinkedAndroid.proguard.flags | 16 |
2 files changed, 17 insertions, 1 deletions
diff --git a/dx/Android.mk b/dx/Android.mk index d13e29189..c0e10a12b 100644 --- a/dx/Android.mk +++ b/dx/Android.mk @@ -61,7 +61,7 @@ include $(BUILD_SYSTEM)/base_rules.mk $(LOCAL_BUILT_MODULE): PRIVATE_PROGUARD_FLAGS:= \ -include $(addprefix $(LOCAL_PATH)/, shrinkedAndroid.proguard.flags) -$(LOCAL_BUILT_MODULE): $(call java-lib-files,android_stubs_current) \ +$(LOCAL_BUILT_MODULE): $(call java-lib-files,sdk_v20) \ $(addprefix $(LOCAL_PATH)/, shrinkedAndroid.proguard.flags)| $(PROGUARD) @echo Proguard: $@ $(hide) $(PROGUARD) -injars "$<(**/*.class)" -outjars $@ $(PRIVATE_PROGUARD_FLAGS) diff --git a/dx/shrinkedAndroid.proguard.flags b/dx/shrinkedAndroid.proguard.flags index c22ec926c..d248a4a50 100644 --- a/dx/shrinkedAndroid.proguard.flags +++ b/dx/shrinkedAndroid.proguard.flags @@ -5,20 +5,36 @@ -dontpreverify -keep public class * extends android.app.Instrumentation { } +-keep public class android.app.Instrumentation { +} -keep public class * extends android.app.Application { } +-keep public class android.app.Application { +} -keep public class * extends android.app.Activity { } +-keep public class android.app.Activity { +} -keep public class * extends android.app.Service { } +-keep public class android.app.Service { +} -keep public class * extends android.content.ContentProvider { } +-keep public class android.content.ContentProvider { +} -keep public class * extends android.content.BroadcastReceiver { } +-keep public class android.content.BroadcastReceiver { +} -keep public class * extends android.app.backup.BackupAgent { } +-keep public class android.app.backup.BackupAgent { +} -keep public class java.lang.annotation.Annotation { } -keep public class * extends android.test.InstrumentationTestCase { } +-keep public class android.test.InstrumentationTestCase { +} |