From 9b2c4a650b4eec3b091f6621e4c9267e9e062da3 Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Tue, 30 Mar 2021 11:30:23 +0100
Subject: Move framework java filegroups into subdirectories

All the java code used to build the framework jar and run metalava
was previously defined in the toplevel Android.bp files. Move these
into the subdirs where the source actually lives.

This simplifies the rules themselves (no path and needless prefix) and
declutters the top level Android.bp.

Test: m
Change-Id: I97086e309eacb879d16facb8497d9940fa5ddaf6
---
 opengl/java/Android.bp | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 opengl/java/Android.bp

(limited to 'opengl/java')

diff --git a/opengl/java/Android.bp b/opengl/java/Android.bp
new file mode 100644
index 000000000000..8ed4161cb9de
--- /dev/null
+++ b/opengl/java/Android.bp
@@ -0,0 +1,5 @@
+filegroup {
+    name: "framework-opengl-sources",
+    srcs: ["**/*.java"],
+    visibility: ["//frameworks/base"],
+}
-- 
cgit v1.2.3


From de423b7a58080408b57d3e60deef309816fb4d7d Mon Sep 17 00:00:00 2001
From: Bob Badour <bbadour@google.com>
Date: Wed, 31 Mar 2021 19:55:25 -0700
Subject: [LSC] Add LOCAL_LICENSE_KINDS to frameworks/base

Added SPDX-license-identifier-Apache-2.0 to:
  drm/java/Android.bp
  graphics/java/Android.bp
  identity/Android.bp
  identity/java/Android.bp
  keystore/java/Android.bp
  location/java/Android.bp
  location/tests/Android.bp
  lowpan/java/Android.bp
  media/mca/effect/java/Android.bp
  media/mca/filterfw/java/Android.bp
  media/mca/filterpacks/java/Android.bp
  mime/java/Android.bp
  mms/java/Android.bp
  opengl/java/Android.bp
  rs/java/Android.bp
  sax/java/Android.bp
  services/tests/servicestests/test-apps/PackageParsingTestManifests/Android.bp
  telecomm/java/Android.bp
  telephony/common/Android.bp
  tests/FlickerTests/test-apps/Android.bp

Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD to:
  telephony/java/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: I2ee0af9ce8f74de2172b359b41d2c52a8b8f7e6c
---
 opengl/java/Android.bp | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'opengl/java')

diff --git a/opengl/java/Android.bp b/opengl/java/Android.bp
index 8ed4161cb9de..6dbae421e059 100644
--- a/opengl/java/Android.bp
+++ b/opengl/java/Android.bp
@@ -1,3 +1,12 @@
+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"],
+}
+
 filegroup {
     name: "framework-opengl-sources",
     srcs: ["**/*.java"],
-- 
cgit v1.2.3