From 18babf68272c3507cccd60a69476d07e7d8ab7be Mon Sep 17 00:00:00 2001 From: Nan Zhang Date: Tue, 7 Aug 2018 13:36:06 -0700 Subject: [PATCH] Remove Metalava related targets in development. Since api-stubs-docs have been deleted and replaced by Metalava. Test: m -j checkbuild Bug: b/70351683 b/78245848 Change-Id: I6dc8b8f903f77699b90cd5e28c55f74c14a20b54 Merged-In: I6dc8b8f903f77699b90cd5e28c55f74c14a20b54 --- build/Android.bp | 24 ------------------------ build/Android.mk | 42 ------------------------------------------ build/sdk.atree | 8 ++++---- 3 files changed, 4 insertions(+), 70 deletions(-) diff --git a/build/Android.bp b/build/Android.bp index 5d7258876..8f802802f 100644 --- a/build/Android.bp +++ b/build/Android.bp @@ -33,14 +33,6 @@ java_library_static { srcs: [ ":api-stubs-docs", ], - defaults: ["framework-stubs-default"], -} - -java_library_static { - name: "metalava_android_stubs_current", - srcs: [ - ":metalava-api-stubs-docs", - ], libs: [ "stub-annotations", ], @@ -60,14 +52,6 @@ java_library_static { srcs: [ ":system-api-stubs-docs", ], - defaults: ["framework-stubs-default"], -} - -java_library_static { - name: "metalava_android_system_stubs_current", - srcs: [ - ":metalava-system-api-stubs-docs", - ], libs: [ "stub-annotations", ], @@ -87,14 +71,6 @@ java_library_static { srcs: [ ":test-api-stubs-docs", ], - defaults: ["framework-stubs-default"], -} - -java_library_static { - name: "metalava_android_test_stubs_current", - srcs: [ - ":metalava-test-api-stubs-docs", - ], libs: [ "stub-annotations", ], diff --git a/build/Android.mk b/build/Android.mk index 276e70fe3..2163ab2a2 100644 --- a/build/Android.mk +++ b/build/Android.mk @@ -80,30 +80,6 @@ $(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 ============ -full_target := $(call intermediates-dir-for,JAVA_LIBRARIES,metalava_android_stubs_current,,COMMON)/classes.jar -full_src_target := $(OUT_DOCS)/metalava-api-stubs-docs-stubs.srcjar - -.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 @@ -178,21 +154,3 @@ 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 ============ -full_target := $(call intermediates-dir-for,JAVA_LIBRARIES,metalava_android_system_stubs_current,,COMMON)/classes.jar - -.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 ============ -full_target := $(call intermediates-dir-for,JAVA_LIBRARIES,metalava_android_test_stubs_current,,COMMON)/classes.jar - -.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/sdk.atree b/build/sdk.atree index 65f0b3742..f567e81df 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 -${OUT_DIR}/target/common/obj/PACKAGING/metalava-api-stubs-docs_annotations.zip platform-tools/api/annotations.zip +${OUT_DIR}/target/common/obj/PACKAGING/api-stubs-docs_annotations.zip platform-tools/api/annotations.zip ############################################################################## # Build Tools Component @@ -157,8 +157,8 @@ ${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/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 +${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 # optional API files. development/build/optional.json platforms/${PLATFORM_NAME}/optional/optional.json @@ -205,7 +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-docs_annotations.zip platforms/${PLATFORM_NAME}/data/annotations.zip +${OUT_DIR}/target/common/obj/PACKAGING/api-stubs-docs_annotations.zip platforms/${PLATFORM_NAME}/data/annotations.zip # Eclipse Editors support framework/layoutlib-legacy.jar platforms/${PLATFORM_NAME}/data/layoutlib.jar