Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ee5bc29 authored by Wei Li's avatar Wei Li Committed by Automerger Merge Worker
Browse files

Merge "Change the default package license to Apache-2.0 and remove the... 

Merge "Change the default package license to Apache-2.0 and remove the Android.mk." into main am: 7aabac2b am: 45f7be41

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2980340



Change-Id: Ifdfb6ac394ed3bf296c78d00bfec8858e578727c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b98bc87e 45f7be41

tools/aapt2/Android.bp

+1 −6
Original line number Diff line number Diff line
@@ -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 = [

tools/aapt2/Android.mk

deleted100644 → 0
+0 −4
Original line number Diff line number Diff line 
include $(CLEAR_VARS)

aapt2_results := ./out/soong/.intermediates/frameworks/base/tools/aapt2/aapt2_results

$(call declare-1p-target,$(aapt2_results))

aapt2_results :=