diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2018-06-10 19:03:27 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-06-10 19:03:27 +0000 |
commit | 60ec2abfed7a1f94e2dac78eb6c5faf8b17f8dd5 (patch) | |
tree | 0d1a6c6f70996e50ad2483bd5fe32e9a9b130cb8 | |
parent | 5571796bdb4482031f47a322b47d8c56ab0d7a7a (diff) | |
parent | 3a1dcff97b22cc566fc33b655d595fcd61dbb42e (diff) | |
download | development-security-pi-release.tar.gz |
Snap for 4832339 from 3a1dcff97b22cc566fc33b655d595fcd61dbb42e to pi-releaseandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-security-9.0.0_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-cts-release
Change-Id: I1e9d12f483d7f384e06723b434d4172c878b54de
-rw-r--r-- | build/Android.mk | 48 | ||||
-rw-r--r-- | build/build_android_stubs.mk | 9 |
2 files changed, 56 insertions, 1 deletions
diff --git a/build/Android.mk b/build/Android.mk index eaa691abd..db55681d8 100644 --- a/build/Android.mk +++ b/build/Android.mk @@ -87,6 +87,31 @@ $(android_jar_src_target): $(full_src_target) ALL_SDK_FILES += $(android_jar_full_target) ALL_SDK_FILES += $(android_jar_src_target) +# ============ Metalava SDK jar file of stubs ============ +sdk_stub_name := metalava_android_stubs_current +stub_timestamp := $(OUT_DOCS)/metalava-api-stubs-timestamp +include $(LOCAL_PATH)/build_android_stubs.mk + +.PHONY: metalava_android_stubs +metalava_android_stubs: $(full_target) $(full_src_target) + +# android.jar is what we put in the SDK package. +android_jar_intermediates := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/metalava_android_jar_intermediates +android_jar_full_target := $(android_jar_intermediates)/metalava-android.jar +android_jar_src_target := $(android_jar_intermediates)/metalava-android-stubs-src.jar + +$(android_jar_full_target): $(full_target) + @echo Package SDK Stubs: $@ + $(copy-file-to-target) + +$(android_jar_src_target): $(full_src_target) + @echo Package SDK Stubs Source: $@ + $(hide)mkdir -p $(dir $@) + $(hide)$(ACP) $< $@ + +ALL_SDK_FILES += $(android_jar_full_target) +ALL_SDK_FILES += $(android_jar_src_target) + # ==================================================== # The uiautomator stubs @@ -166,3 +191,26 @@ android_test_stubs: $(full_target) # Build and store the android_test.jar. $(call dist-for-goals,sdk win_sdk,$(full_target):android_test.jar) + +# ============ Metalava System SDK ============ +sdk_stub_name := metalava_android_system_stubs_current +stub_timestamp := $(OUT_DOCS)/metalava-system-api-stubs-timestamp +include $(LOCAL_PATH)/build_android_stubs.mk + +.PHONY: metalava_android_system_stubs +metalava_android_system_stubs: $(full_target) + +# Build and store the android_system.jar. +$(call dist-for-goals,sdk win_sdk,$(full_target):metalava_android_system.jar) + +# ============ Metalava Test SDK ============ +sdk_stub_name := metalava_android_test_stubs_current +stub_timestamp := $(OUT_DOCS)/metalava-test-api-stubs-timestamp +include $(LOCAL_PATH)/build_android_stubs.mk + +.PHONY: metalava_android_test_stubs +metalava_android_test_stubs: $(full_target) + +# Build and store the android_test.jar. +$(call dist-for-goals,sdk win_sdk,$(full_target):metalava_android_test.jar) + diff --git a/build/build_android_stubs.mk b/build/build_android_stubs.mk index 144bcd0ba..d324934e5 100644 --- a/build/build_android_stubs.mk +++ b/build/build_android_stubs.mk @@ -39,6 +39,13 @@ else $(full_target): PRIVATE_ERRORPRONE_FLAGS := endif +ifneq ($(filter metalava%,$(sdk_stub_name)),) +$(full_target): $(HOST_OUT_JAVA_LIBRARIES)/stub-annotations$(COMMON_JAVA_PACKAGE_SUFFIX) +$(full_target): PRIVATE_METALAVA_CLASSPATH := -classpath $(HOST_OUT_JAVA_LIBRARIES)/stub-annotations$(COMMON_JAVA_PACKAGE_SUFFIX) +else +$(full_target): PRIVATE_METALAVA_CLASSPATH := +endif + $(full_src_target): $(stub_timestamp) @echo Packaging SDK Stub sources: $@ $(hide) cd $(PRIVATE_INTERMEDIATES_DIR) && zip -rq $(notdir $@) $(notdir $(PRIVATE_SRC_DIR)) @@ -63,7 +70,7 @@ $(full_target): $(stub_timestamp) $(framework_res_package) $(ZIPTIME) $(hide) find $(PRIVATE_SRC_DIR) -name "*.java" > \ $(PRIVATE_INTERMEDIATES_DIR)/java-source-list $(hide) $(TARGET_JAVAC) $(PRIVATE_ERRORPRONE_FLAGS) \ - -source 1.8 -target 1.8 -encoding UTF-8 -bootclasspath "" \ + -source 1.8 -target 1.8 -encoding UTF-8 -bootclasspath "" $(PRIVATE_METALAVA_CLASSPATH) \ -g -d $(PRIVATE_CLASS_INTERMEDIATES_DIR) \ \@$(PRIVATE_INTERMEDIATES_DIR)/java-source-list \ || ( rm -rf $(PRIVATE_CLASS_INTERMEDIATES_DIR) ; exit 41 ) |