diff options
| author | Yohann Roussel <yroussel@google.com> | 2018-02-02 08:55:07 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-02-02 08:55:07 +0000 |
| commit | 5ae27dfb9cee5a312cb0a1e1da57195107b7bbf4 (patch) | |
| tree | 04cdb98d71386c673a6b04d1e1ccf60e21423081 | |
| parent | 11b61a49725c31291a17adb09b804ce5c7de4ef8 (diff) | |
| parent | 87cef63ab482cc3a7f33fff4f3a079f9824856ed (diff) | |
| download | dalvik-5ae27dfb9cee5a312cb0a1e1da57195107b7bbf4.tar.gz | |
Merge "Build shrinkedAndroid.jar from SDK 20 API" am: 6e979de7e8 am: 970a20d749android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-dev
am: 87cef63ab4
Change-Id: If96d1a6b829a67f2ecf8783b80bfe0a492508b4e
| -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 { +} |