summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCole Faust <colefaust@google.com>2022-10-06 13:40:11 -0700
committerCole Faust <colefaust@google.com>2022-10-06 13:40:11 -0700
commitd01c3b26d1fa4bd559672081bed1f2f9e7cd1f1a (patch)
treed36f44ddaafc0cd3eaa76f5d87eb718f6b83b865
parentf6e13d426b80e9294e760915b0e81d71f6f77958 (diff)
downloaddevelopment-d01c3b26d1fa4bd559672081bed1f2f9e7cd1f1a.tar.gz
Dist the module-lib and system-server lint databases
So that they can be downloaded to prebuilts/sdk. Bug: 193460475 Test: m sdk dist Change-Id: I0018256221c994b1b7070bab13a45e5067df1c2a
-rw-r--r--build/Android.mk20
1 files changed, 18 insertions, 2 deletions
diff --git a/build/Android.mk b/build/Android.mk
index 0e8237055..bdfc1d769 100644
--- a/build/Android.mk
+++ b/build/Android.mk
@@ -93,7 +93,7 @@ ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android_uiaut
ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/org.apache.http.legacy.stubs_intermediates/classes.jar
# Android Automotive OS stubs
-ALL_SDK_FILES += $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/android.car-stubs_intermediates/classes.jar
+ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android.car-stubs_intermediates/classes.jar
# test stubs
ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android.test.mock.stubs_intermediates/classes.jar
@@ -112,13 +112,29 @@ ALL_SDK_FILES += $(full_target)
$(call dist-for-goals,sdk,$(full_target):data/annotations.zip)
# ======= Lint system API XML ===========
-full_target := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/framework-doc-system-stubs_generated-api-versions.xml
+full_target := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/api_versions_system_generated-api-versions.xml
$(call dist-for-goals,sdk,$(full_target):system-data/api-versions.xml)
# ======= Lint system Annotations zip ===========
full_target := $(call intermediates-dir-for,ETC,sdk-annotations-system.zip)/sdk-annotations-system.zip
$(call dist-for-goals,sdk,$(full_target):system-data/annotations.zip)
+# ======= Lint module-lib API XML ===========
+full_target := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/api_versions_module_lib_generated-api-versions.xml
+$(call dist-for-goals,sdk,$(full_target):module-lib-data/api-versions.xml)
+
+# ======= Lint module-lib Annotations zip ===========
+full_target := $(call intermediates-dir-for,ETC,sdk-annotations-module-lib.zip)/sdk-annotations-module-lib.zip
+$(call dist-for-goals,sdk,$(full_target):module-lib-data/annotations.zip)
+
+# ======= Lint system-server API XML ===========
+full_target := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/api_versions_system_server_generated-api-versions.xml
+$(call dist-for-goals,sdk,$(full_target):system-server-data/api-versions.xml)
+
+# ======= Lint system-server Annotations zip ===========
+full_target := $(call intermediates-dir-for,ETC,sdk-annotations-system-server.zip)/sdk-annotations-system-server.zip
+$(call dist-for-goals,sdk,$(full_target):system-server-data/annotations.zip)
+
# ============ SDK AIDL ============
$(eval $(call copy-one-file,$(FRAMEWORK_AIDL),$(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/framework.aidl))
ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/framework.aidl