From 3a1dcff97b22cc566fc33b655d595fcd61dbb42e Mon Sep 17 00:00:00 2001 From: Nan Zhang Date: Wed, 6 Jun 2018 19:01:05 -0700 Subject: [PATCH 01/10] Compile metalava android.jar Test: manually cp stub-annotations.jar to pi-dev; and m -j metalava_android_stubs Bug: b/78245848 Change-Id: I897b1bf1789e6a8bea962001c31cd65d621626b1 Merged-In: I31623d7a7196cd3d00c62b0a885babc8aad2b128 --- build/Android.mk | 48 ++++++++++++++++++++++++++++++++++++ build/build_android_stubs.mk | 9 ++++++- 2 files changed, 56 insertions(+), 1 deletion(-) 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 ) From 91967398ad528f87d520b93049692810dbf0ca14 Mon Sep 17 00:00:00 2001 From: Nan Zhang Date: Fri, 8 Jun 2018 21:36:18 -0700 Subject: [PATCH 02/10] Dist-for-goal metalava-android.jar Test: N/A Bug: b/78245848 Change-Id: I277e1fbb57a8a77ebab789cc443cbe2a88c9633f Merged-In: I5180bc18979415cec6255beb3fe2c48ec298d3ae --- build/Android.mk | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/build/Android.mk b/build/Android.mk index db55681d8..e3283b62d 100644 --- a/build/Android.mk +++ b/build/Android.mk @@ -95,23 +95,7 @@ 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) - +$(call dist-for-goals,sdk win_sdk,$(full_target):metalava_android.jar) # ==================================================== # The uiautomator stubs From 266ad89c16f91d688f9177e9ecf50afe32837717 Mon Sep 17 00:00:00 2001 From: bohu Date: Tue, 12 Jun 2018 12:05:03 -0700 Subject: [PATCH 03/10] emulator: use 4.4 kernel for arm images BUG: 109735735 this cl does not impact real devices Change-Id: I56f9925bd4e0b93f2d6b71b710583e9ef298a875 --- build/sdk-android-arm64-v8a.atree | 2 +- build/sdk-android-armeabi-v7a.atree | 2 +- build/sdk-android-armeabi.atree | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/sdk-android-arm64-v8a.atree b/build/sdk-android-arm64-v8a.atree index e5e9f78ed..56fba15cd 100644 --- a/build/sdk-android-arm64-v8a.atree +++ b/build/sdk-android-arm64-v8a.atree @@ -14,7 +14,7 @@ # limitations under the License. # -prebuilts/qemu-kernel/${TARGET_ARCH}/3.18/kernel-qemu2 system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-ranchu +prebuilts/qemu-kernel/${TARGET_ARCH}/4.4/kernel-qemu2 system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-ranchu # version files for the SDK updater, from development.git ${HOST_OUT}/development/sys-img-${TARGET_CPU_ABI}/images_arm64-v8a_source.properties system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/source.properties diff --git a/build/sdk-android-armeabi-v7a.atree b/build/sdk-android-armeabi-v7a.atree index d488c95ce..a05229c70 100644 --- a/build/sdk-android-armeabi-v7a.atree +++ b/build/sdk-android-armeabi-v7a.atree @@ -15,7 +15,7 @@ # # Copy the ARMv7 specific kernel image to .../kernel-qemu -prebuilts/qemu-kernel/arm64/3.18/kernel-qemu2 system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-ranchu-64 +prebuilts/qemu-kernel/arm64/4.4/kernel-qemu2 system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-ranchu-64 # version files for the SDK updater, from development.git ${HOST_OUT}/development/sys-img-${TARGET_CPU_ABI}/images_armeabi-v7a_source.properties system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/source.properties diff --git a/build/sdk-android-armeabi.atree b/build/sdk-android-armeabi.atree index 90afc82eb..293ea4c5e 100644 --- a/build/sdk-android-armeabi.atree +++ b/build/sdk-android-armeabi.atree @@ -15,7 +15,7 @@ # prebuilts/qemu-kernel/${TARGET_ARCH}/kernel-qemu system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-qemu -prebuilts/qemu-kernel/arm64/3.18/kernel-qemu2 system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-ranchu-64 +prebuilts/qemu-kernel/arm64/4.4/kernel-qemu2 system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-ranchu-64 # version files for the SDK updater, from development.git ${HOST_OUT}/development/sys-img-${TARGET_CPU_ABI}/images_armeabi_source.properties system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/source.properties From f13bb3dab6c5617ec88d6a6ba8628ce049ed693a Mon Sep 17 00:00:00 2001 From: Tor Norbye Date: Wed, 13 Jun 2018 18:29:45 -0400 Subject: [PATCH 04/10] Use android.jar from Metalava. This CL only affects the SDK. It reverts commit 91967398ad528f87d520b93049692810dbf0ca14 and then updates the packaging source for android.jar to the metalava jar. It also packages the extracted annotations, annotations.zip. Test: Manually built various apps with android.jar file as well as some binary verification with javap Bug: 78245848 Change-Id: I5614a7f5af11d12c99cf0275ae0a88d97cc0bbc7 Merged-In: I5180bc18979415cec6255beb3fe2c48ec298d3ae --- build/Android.mk | 18 +++++++++++++++++- build/sdk.atree | 8 +++++--- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/build/Android.mk b/build/Android.mk index e3283b62d..db55681d8 100644 --- a/build/Android.mk +++ b/build/Android.mk @@ -95,7 +95,23 @@ include $(LOCAL_PATH)/build_android_stubs.mk .PHONY: metalava_android_stubs metalava_android_stubs: $(full_target) $(full_src_target) -$(call dist-for-goals,sdk win_sdk,$(full_target):metalava_android.jar) +# 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 diff --git a/build/sdk.atree b/build/sdk.atree index b160cbf66..421f494a2 100644 --- a/build/sdk.atree +++ b/build/sdk.atree @@ -64,7 +64,7 @@ external/chromium-trace/UPSTREAM_REVISION platfo # Compatibility: moved to platform but also leave them in platform-tools for a little # longer until all active Gradle plugins have support for looking in both places development/sdk/generated-api-versions.xml platform-tools/api/api-versions.xml -prebuilts/sdk/sdk-annotations/annotations.zip platform-tools/api/annotations.zip +${OUT_DIR}/target/common/obj/PACKAGING/metalava-api-stubs_annotations.zip platform-tools/api/annotations.zip ############################################################################## # Build Tools Component @@ -157,8 +157,9 @@ ${HOST_OUT}/development/sdk/platform_source.properties sdk/sdk-build.prop platforms/${PLATFORM_NAME}/build.prop # Main Public API jar -${OUT_DIR}/target/common/obj/PACKAGING/android_jar_intermediates/android.jar platforms/${PLATFORM_NAME}/android.jar -${OUT_DIR}/target/common/obj/PACKAGING/android_jar_intermediates/android-stubs-src.jar platforms/${PLATFORM_NAME}/android-stubs-src.jar +${OUT_DIR}/target/common/obj/PACKAGING/metalava_android_jar_intermediates/metalava-android.jar platforms/${PLATFORM_NAME}/android.jar +${OUT_DIR}/target/common/obj/PACKAGING/metalava_android_jar_intermediates/metalava-android-stubs-src.jar platforms/${PLATFORM_NAME}/android-stubs-src.jar + # optional API files. development/build/optional.json platforms/${PLATFORM_NAME}/optional/optional.json ${OUT_DIR}/target/common/obj/JAVA_LIBRARIES/org.apache.http.legacy_intermediates/javalib.jar platforms/${PLATFORM_NAME}/optional/org.apache.http.legacy.jar @@ -204,6 +205,7 @@ development/sdk/generated-api-versions.xml platforms/${PLATFORM_NAME}/data/api- # API annotations database for lint prebuilts/sdk/sdk-annotations/annotations.zip platforms/${PLATFORM_NAME}/data/annotations.zip +${OUT_DIR}/target/common/obj/PACKAGING/metalava-api-stubs_annotations.zip platforms/${PLATFORM_NAME}/data/annotations.zip # Eclipse Editors support framework/layoutlib-legacy.jar platforms/${PLATFORM_NAME}/data/layoutlib.jar From 62fff1d2d7677ff571e07fff9043c63fc5d30bc1 Mon Sep 17 00:00:00 2001 From: Weilun Du Date: Thu, 21 Jun 2018 11:40:51 -0700 Subject: [PATCH 05/10] Copy dummy userdata.img to sdk system images Avd manager in Android Studio requires userdata.img in the downloaded system image. As we no longer inlcude the real userdata.img, we copy the dummy userdata.img to pass the check. This cl does not impact real devices. BUG: 110492064 Change-Id: Ia8377ce72e32c3556a5a27100085a07f43d9917c Signed-off-by: Weilun Du --- build/sdk.atree | 1 + 1 file changed, 1 insertion(+) diff --git a/build/sdk.atree b/build/sdk.atree index 421f494a2..410d35478 100644 --- a/build/sdk.atree +++ b/build/sdk.atree @@ -237,6 +237,7 @@ development/sdk/sdk_files_NOTICE.txt platforms/${PLATFORM_NAME}/skins/NOTIC system-qemu.img system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/system.img vendor-qemu.img system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/vendor.img ramdisk.img system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/ramdisk.img +device/generic/goldfish/data/etc/userdata.img system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/userdata.img data/misc system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/data/misc system/build.prop system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/build.prop From 41e49c338106534443c0ae2dfe2c75c4491d1b81 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Mon, 2 Jul 2018 11:29:03 -0700 Subject: [PATCH 06/10] Pass compiled metalava stub classes through metalava again Use metalava --rewrite-annotations to pass the compiled sdk stub class files through metalava again to make the annotations package private. Bug: 110532131 Test: m out/target/common/obj/JAVA_LIBRARIES/metalava_android_stubs_current_intermediates/classes.jar Change-Id: I124e8d89075ec682e9fc3602ef232492bed849aa Merged-In: I5180bc18979415cec6255beb3fe2c48ec298d3ae --- build/build_android_stubs.mk | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/build/build_android_stubs.mk b/build/build_android_stubs.mk index d324934e5..393b21328 100644 --- a/build/build_android_stubs.mk +++ b/build/build_android_stubs.mk @@ -39,9 +39,13 @@ else $(full_target): PRIVATE_ERRORPRONE_FLAGS := endif -ifneq ($(filter metalava%,$(sdk_stub_name)),) +my_use_metalava := $(filter metalava%,$(sdk_stub_name)) +$(warning $(sdk_stub_name) $(my_use_metalava)) + +ifdef my_use_metalava $(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) +$(full_target): $(HOST_OUT_JAVA_LIBRARIES)/metalava.jar else $(full_target): PRIVATE_METALAVA_CLASSPATH := endif @@ -74,6 +78,10 @@ $(full_target): $(stub_timestamp) $(framework_res_package) $(ZIPTIME) -g -d $(PRIVATE_CLASS_INTERMEDIATES_DIR) \ \@$(PRIVATE_INTERMEDIATES_DIR)/java-source-list \ || ( rm -rf $(PRIVATE_CLASS_INTERMEDIATES_DIR) ; exit 41 ) +ifdef my_use_metalava + $(hide) $(JAVA) -jar $(HOST_OUT_JAVA_LIBRARIES)/metalava.jar \ + --no-banner --rewrite-annotations $(PRIVATE_CLASS_INTERMEDIATES_DIR) +endif $(hide) if [ ! -f $(PRIVATE_FRAMEWORK_RES_PACKAGE) ]; then \ echo Missing file $(PRIVATE_FRAMEWORK_RES_PACKAGE); \ rm -rf $(PRIVATE_CLASS_INTERMEDIATES_DIR); \ From f29bc6c5da24ca0c5498ac2c99b2e87f7c57c329 Mon Sep 17 00:00:00 2001 From: bohu Date: Fri, 6 Jul 2018 08:59:15 -0700 Subject: [PATCH 07/10] emulator: bump sdk image revision to 4 For DP5 release of emulator system images BUG: 111204833 this cl does not impact real devices Change-Id: I32b0421dbadbf9dade9df33396bf041092e7cfd6 --- sys-img/images_arm64-v8a_source.prop_template | 2 +- sys-img/images_armeabi-v7a_source.prop_template | 2 +- sys-img/images_armeabi_source.prop_template | 2 +- sys-img/images_x86_64_source.prop_template | 2 +- sys-img/images_x86_source.prop_template | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys-img/images_arm64-v8a_source.prop_template b/sys-img/images_arm64-v8a_source.prop_template index 4cd941eb2..c2c385180 100644 --- a/sys-img/images_arm64-v8a_source.prop_template +++ b/sys-img/images_arm64-v8a_source.prop_template @@ -1,6 +1,6 @@ Pkg.Desc=Android SDK System Image Pkg.UserSrc=false -Pkg.Revision=3 +Pkg.Revision=4 AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION} AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME} SystemImage.Abi=arm64-v8a diff --git a/sys-img/images_armeabi-v7a_source.prop_template b/sys-img/images_armeabi-v7a_source.prop_template index 22666796e..6322547c3 100644 --- a/sys-img/images_armeabi-v7a_source.prop_template +++ b/sys-img/images_armeabi-v7a_source.prop_template @@ -1,6 +1,6 @@ Pkg.Desc=Android SDK System Image Pkg.UserSrc=false -Pkg.Revision=3 +Pkg.Revision=4 AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION} AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME} SystemImage.Abi=armeabi-v7a diff --git a/sys-img/images_armeabi_source.prop_template b/sys-img/images_armeabi_source.prop_template index c111286d8..ebfec294c 100644 --- a/sys-img/images_armeabi_source.prop_template +++ b/sys-img/images_armeabi_source.prop_template @@ -1,6 +1,6 @@ Pkg.Desc=Android SDK System Image Pkg.UserSrc=false -Pkg.Revision=3 +Pkg.Revision=4 AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION} AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME} SystemImage.Abi=armeabi diff --git a/sys-img/images_x86_64_source.prop_template b/sys-img/images_x86_64_source.prop_template index 9574d5de6..7f7af450c 100644 --- a/sys-img/images_x86_64_source.prop_template +++ b/sys-img/images_x86_64_source.prop_template @@ -1,6 +1,6 @@ Pkg.Desc=Android SDK System Image Pkg.UserSrc=false -Pkg.Revision=3 +Pkg.Revision=4 AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION} AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME} SystemImage.Abi=x86_64 diff --git a/sys-img/images_x86_source.prop_template b/sys-img/images_x86_source.prop_template index 6f701a2b4..ef470a024 100644 --- a/sys-img/images_x86_source.prop_template +++ b/sys-img/images_x86_source.prop_template @@ -1,6 +1,6 @@ Pkg.Desc=Android SDK System Image Pkg.UserSrc=false -Pkg.Revision=3 +Pkg.Revision=4 AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION} AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME} SystemImage.Abi=x86 From c1885b13d86b096f60e3e4cd6d4e0df819fbe915 Mon Sep 17 00:00:00 2001 From: Miao Wang Date: Fri, 1 Jun 2018 11:51:40 -0700 Subject: [PATCH 08/10] Update SDK tree after androidx.renderscript file name change. - androidx.renderscript prebuilt is named as androidx-rs. - android.support.v8.renderscript prebuilt is still renderscript-v8. - Note, this ONLY impact SDK and not device images. Bug: 74398526 Test: mm Change-Id: Ibdd547d4ce5ccb02394c2ce708561b1f13c8e16a (cherry picked from commit ff268369ee9d31517779f8269a7727be62db4d2f) --- build/sdk.atree | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/sdk.atree b/build/sdk.atree index 421f494a2..ebead6434 100644 --- a/build/sdk.atree +++ b/build/sdk.atree @@ -91,7 +91,8 @@ frameworks/rs/script_api/include build-tools/${PLATFORM_NAME}/rende external/clang/lib/Headers build-tools/${PLATFORM_NAME}/renderscript/clang-include external/clang/LICENSE.TXT build-tools/${PLATFORM_NAME}/renderscript/clang-include/LICENSE.TXT -prebuilts/sdk/renderscript/lib/javalib.jar build-tools/${PLATFORM_NAME}/renderscript/lib/renderscript-v8.jar +prebuilts/sdk/renderscript/lib/javalib.jar build-tools/${PLATFORM_NAME}/renderscript/lib/androidx-rs.jar +prebuilts/sdk/renderscript/lib/javalib_legacy.jar build-tools/${PLATFORM_NAME}/renderscript/lib/renderscript-v8.jar prebuilts/sdk/renderscript/lib/arm/libc.so build-tools/${PLATFORM_NAME}/renderscript/lib/intermediates/armeabi-v7a/libc.so prebuilts/sdk/renderscript/lib/arm/libm.so build-tools/${PLATFORM_NAME}/renderscript/lib/intermediates/armeabi-v7a/libm.so From b59ccfdd284810c8f24b6938361ce365bb7be280 Mon Sep 17 00:00:00 2001 From: Tor Norbye Date: Thu, 19 Jul 2018 13:40:39 -0700 Subject: [PATCH 09/10] 111614464: Update the api-generator script This CL updates the api generator to include the fix from I6f2b3bf950fbd79f81dcd0c484be400044f2c0dd which skips package protected members. Test: Lint Bug: 111614464 Change-Id: Ib6a50a6ecc871c01895b4c903b4ff3be1cc917c4 --- build/Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Android.mk b/build/Android.mk index db55681d8..4fa56f9db 100644 --- a/build/Android.mk +++ b/build/Android.mk @@ -150,7 +150,7 @@ endef ALL_SDK_FILES += $(HOST_OUT)/development/sdk/generated-api-versions.xml -api_gen_jar := $(TOPDIR)prebuilts/tools/common/api-generator/api-generator-26.0.0.jar +api_gen_jar := $(TOPDIR)prebuilts/tools/common/api-generator/api-generator-26.3.0.jar api_gen_deps := \ $(TOPDIR)prebuilts/tools/common/m2/repository/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0.jar \ $(TOPDIR)prebuilts/tools/common/m2/repository/org/ow2/asm/asm/5.0.4/asm-5.0.4.jar \ From 2fcbc4e3641b27fd386a33b2f0cd2edbf8253276 Mon Sep 17 00:00:00 2001 From: Nan Zhang Date: Tue, 18 Sep 2018 10:49:44 -0700 Subject: [PATCH 10/10] Bundle Metalava based api-versions.xml to SDK Since Metalava has the ability to generate api-versions.xml, so just remove the old ones, and ship the new file to SDK. Test: m -j out/target/common/obj/PACKAGING/api-stubs-docs_generated-api-versions.xml Bug: b/78245848 Change-Id: I007fd17b6e0f069f0d9dd9eac192f5e915be5f7a --- build/Android.mk | 37 +------------------------------------ build/sdk.atree | 4 ++-- 2 files changed, 3 insertions(+), 38 deletions(-) diff --git a/build/Android.mk b/build/Android.mk index c7241d92d..13c822873 100644 --- a/build/Android.mk +++ b/build/Android.mk @@ -99,43 +99,8 @@ ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/core-lambda-s # shrinkedAndroid.jar for multidex support ALL_SDK_FILES += $(HOST_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/shrinkedAndroid_intermediates/shrinkedAndroid.jar -# $(1): the Java library name -define _package_sdk_library -$(eval _psm_build_module := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/$(1)_intermediates/classes.jar) -$(eval _psm_packaging_target := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/$(1)_intermediates/$(1).jar) -$(_psm_packaging_target) : $(_psm_build_module) - @echo "Package $(1).jar: $$@" - $$(copy-file-to-target) - @# Delete resource generated classes from the jar files. - $(hide) zip -d $$@ "*/R.class" "*/R\$$$$*.class" "*/Manifest.class" "*/Manifest\$$$$*.class" >/dev/null 2>&1 || true - -ALL_SDK_FILES += $(_psm_packaging_target) -$(eval _psm_build_module :=) -$(eval _psm_packaging_target :=) -endef - # ======= Lint API XML =========== - -ALL_SDK_FILES += $(HOST_OUT)/development/sdk/generated-api-versions.xml - -api_gen_jar := $(TOPDIR)prebuilts/tools/common/api-generator/api-generator-26.3.0.jar -api_gen_deps := \ - $(TOPDIR)prebuilts/tools/common/m2/repository/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0.jar \ - $(TOPDIR)prebuilts/tools/common/m2/repository/org/ow2/asm/asm/5.0.4/asm-5.0.4.jar \ - $(TOPDIR)prebuilts/tools/common/m2/repository/org/ow2/asm/asm-tree/5.0.4/asm-tree-5.0.4.jar \ - $(TOPDIR)prebuilts/tools/common/m2/repository/com/google/guava/guava/17.0/guava-17.0.jar -api_gen_classpath := $(subst $(space),:,$(api_gen_jar) $(api_gen_deps)) - - -$(HOST_OUT)/development/sdk/generated-api-versions.xml: $(android_jar_full_target) - $(JAVA) -cp $(api_gen_classpath) \ - com.android.apigenerator.Main \ - --pattern $(TOPDIR)prebuilts/tools/common/api-versions/android-%/android.jar \ - --pattern $(TOPDIR)prebuilts/sdk/%/public/android.jar \ - --current-version $(PLATFORM_SDK_VERSION) \ - --current-codename $(PLATFORM_VERSION_CODENAME) \ - --current-jar $(android_jar_full_target) \ - $@ +ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/api-stubs-docs_generated-api-versions.xml # ============ System SDK ============ full_target := $(call intermediates-dir-for,JAVA_LIBRARIES,android_system_stubs_current,,COMMON)/classes.jar diff --git a/build/sdk.atree b/build/sdk.atree index ae6be5eb5..24b997d4f 100644 --- a/build/sdk.atree +++ b/build/sdk.atree @@ -67,7 +67,7 @@ external/chromium-trace/UPSTREAM_REVISION platfo # Compatibility: moved to platform but also leave them in platform-tools for a little # longer until all active Gradle plugins have support for looking in both places -development/sdk/generated-api-versions.xml platform-tools/api/api-versions.xml +${OUT_DIR}/target/common/obj/PACKAGING/api-stubs-docs_generated-api-versions.xml platform-tools/api/api-versions.xml ${OUT_DIR}/target/common/obj/PACKAGING/api-stubs-docs_annotations.zip platform-tools/api/annotations.zip ############################################################################## @@ -206,7 +206,7 @@ development/tools/templates/ic_launcher_hdpi.png platforms/${PLATFORM development/tools/templates/ic_launcher_xhdpi.png platforms/${PLATFORM_NAME}/templates/ic_launcher_xhdpi.png # API database for tools such as lint -development/sdk/generated-api-versions.xml platforms/${PLATFORM_NAME}/data/api-versions.xml +${OUT_DIR}/target/common/obj/PACKAGING/api-stubs-docs_generated-api-versions.xml platforms/${PLATFORM_NAME}/data/api-versions.xml # API annotations database for lint prebuilts/sdk/sdk-annotations/annotations.zip platforms/${PLATFORM_NAME}/data/annotations.zip