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

Commit 7aabac2b authored by Wei Li's avatar Wei Li Committed by Gerrit Code Review
Browse files

Merge "Change the default package license to Apache-2.0 and remove the Android.mk." into main

parents a42c8c5a 1a20c12e
Loading
Loading
Loading
Loading
+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 :=