diff options
| author | Anton Hansson <hansson@google.com> | 2020-03-23 18:08:55 +0000 |
|---|---|---|
| committer | Anton Hansson <hansson@google.com> | 2020-04-17 11:38:20 +0100 |
| commit | ba367d3b7d05a4fe397a16b115978c5f53df50b9 (patch) | |
| tree | 0f395a9123a7d4a13d2d0c70742a8aefca7435f9 | |
| parent | c0fe0ae29f7de3cfeaad22563cf1e501235b4693 (diff) | |
Convert disting of api txt from mk to bp
droidstubs dist now dists the api file, so convert these manual
mk rules into bp dist instead.
Bug: 149293194
Test: m dist sdk && find out/dist/apistubs -name /android\.txt
Change-Id: I96052b427dc01a6d24b040ad0006129d4d1e48fb
Merged-In: I96052b427dc01a6d24b040ad0006129d4d1e48fb
| -rw-r--r-- | Android.mk | 5 | ||||
| -rw-r--r-- | StubLibraries.bp | 20 | ||||
| -rw-r--r-- | services/Android.bp | 5 |
3 files changed, 25 insertions, 5 deletions
diff --git a/Android.mk b/Android.mk index aea0c951052f..3b307146770e 100644 --- a/Android.mk +++ b/Android.mk @@ -39,11 +39,6 @@ INTERNAL_SDK_SOURCE_DIRS := $(addprefix $(LOCAL_PATH)/,$(dirs_to_document)) $(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_API_FILE)) $(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_SYSTEM_API_FILE)) $(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_TEST_API_FILE)) -$(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_API_FILE):apistubs/android/public/api/android.txt) -$(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_SYSTEM_API_FILE):apistubs/android/system/api/android.txt) -$(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_TEST_API_FILE):apistubs/android/test/api/android.txt) -$(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_MODULE_LIB_API_FILE):apistubs/android/module-lib/api/android.txt) -$(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_SYSTEM_SERVER_API_FILE):apistubs/android/system-server/api/android.txt) # sdk.atree needs to copy the whole dir: $(OUT_DOCS)/offline-sdk to the final zip. # So keep offline-sdk-timestamp target here, and unzip offline-sdk-docs.zip to diff --git a/StubLibraries.bp b/StubLibraries.bp index 304f231cb3af..20c8a83ff83e 100644 --- a/StubLibraries.bp +++ b/StubLibraries.bp @@ -110,6 +110,11 @@ droidstubs { baseline_file: "api/lint-baseline.txt", }, }, + dist: { + targets: ["sdk", "win_sdk"], + dir: "apistubs/android/public/api", + dest: "android.txt", + }, jdiff_enabled: true, } @@ -151,6 +156,11 @@ droidstubs { baseline_file: "api/system-lint-baseline.txt", }, }, + dist: { + targets: ["sdk", "win_sdk"], + dir: "apistubs/android/system/api", + dest: "android.txt", + }, jdiff_enabled: true, } @@ -174,6 +184,11 @@ droidstubs { baseline_file: "api/test-lint-baseline.txt", }, }, + dist: { + targets: ["sdk", "win_sdk"], + dir: "apistubs/android/test/api", + dest: "android.txt", + }, } ///////////////////////////////////////////////////////////////////// @@ -213,6 +228,11 @@ droidstubs { baseline_file: "api/module-lib-lint-baseline.txt", }, }, + dist: { + targets: ["sdk", "win_sdk"], + dir: "apistubs/android/module-lib/api", + dest: "android.txt", + }, } diff --git a/services/Android.bp b/services/Android.bp index 8af642cafffd..ab6fb7ff95d2 100644 --- a/services/Android.bp +++ b/services/Android.bp @@ -133,6 +133,11 @@ droidstubs { baseline_file: "api/lint-baseline.txt", }, }, + dist: { + targets: ["sdk", "win_sdk"], + dir: "apistubs/android/system-server/api", + dest: "android.txt", + }, } java_library { |