diff options
| author | Sungsoo Lim <sungsoo@google.com> | 2015-11-04 10:05:29 +0900 |
|---|---|---|
| committer | Sungsoo Lim <sungsoo@google.com> | 2015-11-10 11:27:49 +0900 |
| commit | eb17dae2f340daf60278b8b12d4dc78213acf1c0 (patch) | |
| tree | 38187851ca720a53e0a6670606ee51ce03076831 | |
| parent | e98429bdc23f9a83c064b1ae649999733a5d7433 (diff) | |
| download | android_frameworks_support-eb17dae2f340daf60278b8b12d4dc78213acf1c0.tar.gz android_frameworks_support-eb17dae2f340daf60278b8b12d4dc78213acf1c0.tar.bz2 android_frameworks_support-eb17dae2f340daf60278b8b12d4dc78213acf1c0.zip | |
Remove framework dummy classes in the output of jack build
Bug: 25300828
Change-Id: I65663c73669876daa1f16775387f1d7a0f459131
| -rw-r--r-- | v4/Android.mk | 17 | ||||
| -rw-r--r-- | v4/jarjar-rules.txt | 4 |
2 files changed, 15 insertions, 6 deletions
diff --git a/v4/Android.mk b/v4/Android.mk index 87ea80e7b9..4336e40928 100644 --- a/v4/Android.mk +++ b/v4/Android.mk @@ -195,11 +195,24 @@ support_module_src_files += $(LOCAL_SRC_FILES) # ----------------------------------------------------------------------- +# A helper sub-library that allows to use Lollipop internal APIs. +include $(CLEAR_VARS) +LOCAL_MODULE := android-support-v4-api21-internal +LOCAL_SDK_VERSION := 21 +LOCAL_SRC_FILES := \ + $(call all-java-files-under, api21/android/content/pm) \ + $(call all-java-files-under, api21/android/service/media) +LOCAL_MODULE_TAGS := optional +include $(BUILD_JAVA_LIBRARY) + +# ----------------------------------------------------------------------- + # A helper sub-library that makes direct use of Lollipop APIs. include $(CLEAR_VARS) LOCAL_MODULE := android-support-v4-api21 LOCAL_SDK_VERSION := 21 -LOCAL_SRC_FILES := $(call all-java-files-under, api21) +LOCAL_SRC_FILES := $(call all-java-files-under, api21/android/support) +LOCAL_JAVA_LIBRARIES := android-support-v4-api21-internal LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4-api20 include $(BUILD_STATIC_JAVA_LIBRARY) @@ -224,6 +237,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := android-support-v4-api23 LOCAL_SDK_VERSION := current LOCAL_SRC_FILES := $(call all-java-files-under, api23) +LOCAL_JAVA_LIBRARIES := android-support-v4-api21-internal LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4-api22 include $(BUILD_STATIC_JAVA_LIBRARY) @@ -239,7 +253,6 @@ LOCAL_AIDL_INCLUDES := frameworks/support/v4/java LOCAL_SRC_FILES := $(call all-java-files-under, java) \ $(call all-Iaidl-files-under, java) LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4-api23 -LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt include $(BUILD_STATIC_JAVA_LIBRARY) support_module_src_files += $(LOCAL_SRC_FILES) diff --git a/v4/jarjar-rules.txt b/v4/jarjar-rules.txt deleted file mode 100644 index 51761d4ed3..0000000000 --- a/v4/jarjar-rules.txt +++ /dev/null @@ -1,4 +0,0 @@ -# Exclude the duplicated classes that are already present -# in the Android frameworks. -zap android.content.pm.** -zap android.service.media.** |