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

Commit 2177290e authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6607158 from 5f051428 to mainline-release

Change-Id: I4dc1c35a2b9f1671b06b06b7a9e6e30e0def6987
parents 2e827932 5f051428
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -1479,6 +1479,8 @@ license_modules := $(filter-out $(TARGET_OUT_FAKE)/%,$(license_modules))
# testcases are not relevant to the system image.
license_modules := $(filter-out $(TARGET_OUT_TESTCASES)/%,$(license_modules))
license_modules_system := $(filter $(TARGET_OUT)/%,$(license_modules))
# system_other is relevant to system partition.
license_modules_system += $(filter $(TARGET_OUT_SYSTEM_OTHER)/%,$(license_modules))
license_modules_vendor := $(filter $(TARGET_OUT_VENDOR)/%,$(license_modules))
license_modules_product := $(filter $(TARGET_OUT_PRODUCT)/%,$(license_modules))
license_modules_system_ext := $(filter $(TARGET_OUT_SYSTEM_EXT)/%,$(license_modules))
+5 −0
Original line number Diff line number Diff line
@@ -49,8 +49,10 @@ def CheckJar(allow_list_path, jar):
  if p.returncode != 0:
    return False
  items = stdout.split()
  classes = 0
  for f in items:
    if f.endswith('.class'):
      classes += 1
      package_name = os.path.dirname(f)
      package_name = package_name.replace('/', '.')
      if not package_name or not allow_list_re.match(package_name):
@@ -58,6 +60,9 @@ def CheckJar(allow_list_path, jar):
                              ' not in the allow list %s of packages allowed on the bootclasspath.'
                              % (jar, f, package_name, allow_list_path))
        return False
  if classes == 0:
    print >> sys.stderr, ('Error: %s does not contain any class files.' % jar)
    return False
  return True


+1 −0
Original line number Diff line number Diff line
@@ -118,6 +118,7 @@ PRODUCT_PACKAGES += \
    javax.obex \
    service-jobscheduler \
    keystore \
    credstore \
    ld.mc \
    libaaudio \
    libamidi \
+1 −0
Original line number Diff line number Diff line
/oem
/product
/system_ext
+2 −2
Original line number Diff line number Diff line
@@ -13,6 +13,6 @@
# limitations under the License.
#

# Enable Camera pinner by default
# Disable Camera pinner by default
PRODUCT_PRODUCT_PROPERTIES += \
    pinner.pin_camera=true
    pinner.pin_camera=false