diff options
| author | Wei Li <weiwli@google.com> | 2024-02-27 18:00:13 -0800 |
|---|---|---|
| committer | Wei Li <weiwli@google.com> | 2024-02-27 18:00:13 -0800 |
| commit | 1a20c12e2ebf2304aeb13f896bc652356fc90e2b (patch) | |
| tree | 7a1ad38cf51c43c0676e2ffbccda10ae652ff3be /tools | |
| parent | c264cd5c43f78206fe6e240c89a7ea4e457564ac (diff) | |
| download | base-1a20c12e2ebf2304aeb13f896bc652356fc90e2b.tar.gz | |
Change the default package license to Apache-2.0 and remove the Android.mk.
The Android.mk contains license declaration for aapt2_result only, and with this change that declares the license of the package precisely the
Android.mk is not needed any more.
Bug: 322285259
Test: CIs
Change-Id: Ie4b82686cc72d07b1c75016ede6f3c7c53816e83
Diffstat (limited to 'tools')
| -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 dbac6cabd987..7063b89a4156 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 := |