diff options
| author | 2024-03-04 22:34:53 +0000 | |
|---|---|---|
| committer | 2024-03-04 22:34:53 +0000 | |
| commit | 45f7be41aa9c44d26130ca60e22af69d40e892fb (patch) | |
| tree | ad7913c1d74742aca32dcdeb932a8fdb4bc6e4a4 | |
| parent | 939df7b64f7305a7aff3592d89b27ec4549e90bf (diff) | |
| parent | 7aabac2b9caf4c41d6be11260dd924ec5c0150cf (diff) | |
Merge "Change the default package license to Apache-2.0 and remove the Android.mk." into main am: 7aabac2b9c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2980340
Change-Id: I1c28273dfab650ab98d70171be490caa85f1fe05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | tools/aapt2/Android.bp | 7 | ||||
| -rw-r--r-- | tools/aapt2/Android.mk | 4 |
2 files changed, 1 insertions, 10 deletions
diff --git a/tools/aapt2/Android.bp b/tools/aapt2/Android.bp index b054a57e85af..b4e2758f4abe 100644 --- a/tools/aapt2/Android.bp +++ b/tools/aapt2/Android.bp @@ -15,12 +15,7 @@ // package { - // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "frameworks_base_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["frameworks_base_license"], + default_applicable_licenses: ["Android-Apache-2.0"], } toolSources = [ diff --git a/tools/aapt2/Android.mk b/tools/aapt2/Android.mk deleted file mode 100644 index 15ae2baa73df..000000000000 --- a/tools/aapt2/Android.mk +++ /dev/null @@ -1,4 +0,0 @@ -include $(CLEAR_VARS) -aapt2_results := ./out/soong/.intermediates/frameworks/base/tools/aapt2/aapt2_results -$(call declare-1p-target,$(aapt2_results)) -aapt2_results := |