Commit graph

52258 commits

Author SHA1 Message Date
Tao Bao
bf3fb024cd releasetools: Fix an issue in handling PRESIGNED APEX keys.
For PRESIGNED APEXes, we should keep carrying the matching public keys
at /system/etc/security/apex.

Bug: 129148142
Test: Run sign_target_files_apks.py on a target_files.zip with presigned
      APEXes. Check the output zip.
Change-Id: I2e941fd9b10e99d2db9df1e5308cbbe8c760177b
2019-03-22 13:16:15 -07:00
Anton Hansson
1683198010 Set file system types for mainline_arm64 partitions
This config was in a weird state where it sets the OUT
directory for these partitions but not the file system
type. Within the build system, both of these variables
are used interchangeably to check whether these partitions
are expected to be present.

A typical mainline device is expected to /vendor and
/product, so just add these.

Bug: 120974093
Test: make
Change-Id: I803d7afdcadc37e4384ae80f08bc1c8db535d2f4
2019-03-22 17:25:43 +00:00
TreeHugger Robot
1a7864212c Merge "Rename module DynamicAndroidInstallationService" 2019-03-22 17:21:39 +00:00
Martin Stjernholm
0e727dd0eb Merge "Exclude libdexfile_external.so to fix aosp_marlin-userdebug builds." am: c62e31242d am: 5355757f74
am: 2242264224

Change-Id: Ice386f7debd22ea87376e617c7870119d7f7cc1d
2019-03-22 08:53:54 -07:00
Martin Stjernholm
2242264224 Merge "Exclude libdexfile_external.so to fix aosp_marlin-userdebug builds." am: c62e31242d
am: 5355757f74

Change-Id: I549c14bd6e5b678f55f9555c7789cab24cdfe937
2019-03-22 08:47:09 -07:00
Martin Stjernholm
5355757f74 Merge "Exclude libdexfile_external.so to fix aosp_marlin-userdebug builds."
am: c62e31242d

Change-Id: I01446f20619e93fd407a9085dba0c3511e15ca13
2019-03-22 08:43:22 -07:00
Martin Stjernholm
c62e31242d Merge "Exclude libdexfile_external.so to fix aosp_marlin-userdebug builds." 2019-03-22 15:35:09 +00:00
Martin Stjernholm
d185bb29ce Exclude libdexfile_external.so to fix aosp_marlin-userdebug builds.
Test: m systemimage
Bug: 124293228
Change-Id: I7a4744457396084ef9fd78d9c2f1efdabe0f981d
2019-03-22 14:24:08 +00:00
Anton Hansson
07fa9b13b4 Make mainline_system_arm64 build only /system
Configure this product not to build any of the other partitions.

Note that the only partition that currently has artifacts produced
is system_other, and this change doesn't appear to prevent odex/vdex
files from being created there anyway. However, it does allow
configuring the target device (mainline_arm64) to have more partitions
in a followup change.

Bug: 111533333
Test: make
Change-Id: Ib115cb03bc99b9b61e0d6f1b622784e7ad5fcea0
2019-03-22 14:07:49 +00:00
Bowgo Tsai
dfac317006 Merge "Adding adb_debug.prop" am: 9da9c32e80 am: b25582f91b
am: 9a6455b071

Change-Id: I6e4828c6a1271a4ccbd4ac959cf0aa3295d37360
2019-03-22 06:27:23 -07:00
Anton Hansson
cb8276fa93 Put DEVICE/PRODUCT overlays in different partitions
This change changes auto-generated RROs from DEVICE_PACKAGE_OVERLAYS
to be generated in the vendor partition, as opposed to /product where
they were generated in the past.

Note that PRODUCT_PACKAGE_OVERLAYS continue generating RRO packages
to /product, which means that a single app can be overlayed from
different partitions. These RROs have been given module and package
names based on their location.

Bug: 127758779
Test: verify noop on presubmit targets
Change-Id: I5cee70e28e3969e67b2d83eaf25d9c6e3a11102d
2019-03-22 13:25:20 +00:00
Bowgo Tsai
9a6455b071 Merge "Adding adb_debug.prop" am: 9da9c32e80
am: b25582f91b

Change-Id: I088e2d613c337bb44c66e680c5c47148c4b4a9f9
2019-03-22 06:23:12 -07:00
Bowgo Tsai
b25582f91b Merge "Adding adb_debug.prop"
am: 9da9c32e80

Change-Id: I4ec4dda0119195636e50eba133170b26377a13cd
2019-03-22 06:16:36 -07:00
Treehugger Robot
9da9c32e80 Merge "Adding adb_debug.prop" 2019-03-22 13:08:24 +00:00
Martin Stjernholm
0e60df18e6 Merge "Check that Runtime APEX libraries don't end up in /system/${LIB}." am: 02699e40ea am: 057b589a96
am: d3409149eb

Change-Id: If12e346e5a0ae7d7db8f15e8567adf29bf3e70ed
2019-03-22 05:55:42 -07:00
Martin Stjernholm
d3409149eb Merge "Check that Runtime APEX libraries don't end up in /system/${LIB}." am: 02699e40ea
am: 057b589a96

Change-Id: I599ccc4bc86de67cd5961c215bcc05f01396755e
2019-03-22 05:50:28 -07:00
Martin Stjernholm
057b589a96 Merge "Check that Runtime APEX libraries don't end up in /system/${LIB}."
am: 02699e40ea

Change-Id: I2a939d8ecc6a94bec2b24f084d58d308afedb470
2019-03-22 05:46:18 -07:00
Treehugger Robot
02699e40ea Merge "Check that Runtime APEX libraries don't end up in /system/${LIB}." 2019-03-22 12:34:05 +00:00
Bowgo Tsai
a280a66b5a Adding adb_debug.prop
The adb_debug.prop will be loaded by init when the file
/force_debuggable is present in the first-stage ramdisk, and the device
is unlocked. This file has the highest priority to override other system
properties, thus can override ro.debuggable to 1 to allow adb root.

Bug: 126493225
Test: boot a device with /force_debuggable in ramdisk, checks
      adb_debug.prop is loaded

Change-Id: I75d661bb04178f584d8b6f5eba26ae35ccb01239
2019-03-22 11:43:33 +08:00
Jiyong Park
b52d505cf6 Merge "Follow symlink when creating symbols.zip" am: 1d38fe98d1 am: ca6cd2dcd3
am: 3bbb92bc72

Change-Id: Icaf93fe5f37c098ebba41695c8cc66b5cc778bec
2019-03-21 15:41:18 -07:00
Jiyong Park
3bbb92bc72 Merge "Follow symlink when creating symbols.zip" am: 1d38fe98d1
am: ca6cd2dcd3

Change-Id: I6e9bdbf18591f82c6379d9e2f413fecdc2ccfcf0
2019-03-21 15:36:57 -07:00
Jiyong Park
ca6cd2dcd3 Merge "Follow symlink when creating symbols.zip"
am: 1d38fe98d1

Change-Id: I8b5c247ba8566596a4bb93a5017d7d089704f0c0
2019-03-21 15:32:42 -07:00
Treehugger Robot
1d38fe98d1 Merge "Follow symlink when creating symbols.zip" 2019-03-21 22:19:49 +00:00
Martin Stjernholm
f1e7c7159b Check that Runtime APEX libraries don't end up in /system/${LIB}.
This is a stop-gap measure for a proper fix enforcing library "ownership" in
Soong: b/128708192

Test: m systemimage (with and without libs that exist in /system/lib)
Test: Check that this fails:
  m systemimage
  m out/target/product/taimen/system/lib/libjdwp.so
  m systemimage-nodeps
Bug: 124293228
Change-Id: Iac0d0cec7d9e216028a0caccfbb76838514d4a7b
2019-03-21 17:52:35 +00:00
Tao Bao
bc3ebf453a Merge changes I662aab3d,I5e741c27 am: c62b9a2347 am: d2e70241f3
am: fe9988cd14

Change-Id: I134c5fcad0380c90d670a110f473f02700c15d65
2019-03-21 10:14:31 -07:00
Tao Bao
fe9988cd14 Merge changes I662aab3d,I5e741c27 am: c62b9a2347
am: d2e70241f3

Change-Id: Ie314023b053ee9adc5d8931403815330d16c3cec
2019-03-21 10:09:12 -07:00
Tao Bao
d2e70241f3 Merge changes I662aab3d,I5e741c27
am: c62b9a2347

Change-Id: Iae61ac00bce4c9189582c301afd562263311f0f7
2019-03-21 10:02:01 -07:00
Tao Bao
c62b9a2347 Merge changes I662aab3d,I5e741c27
* changes:
  Revert^2 "releasetools: check_target_files_signatures.py checks APEXes."
  releasetools: common.UnzipTemp() filters out non-matching patterns.
2019-03-21 16:38:04 +00:00
Anton Hansson
571fab0610 Enable AB_OTA_UPDATER for mainline
The file $(TARGET_OUT_ETC)/update_engine/update-payload-key.pub.pem
is installed conditionally based on this variable, and was found
to differ between mainline_system and the intended device targets.

Also move the variable from gsi_common.mk as GSI inherits the mainline
boardconfig. The variable is not a PRODUCT flag (and not inherited as
such), so fits better in the BoardConfig I think.

Bug: 80410283
Test: presubmit
Change-Id: Ida6fa923fd01b062ff3b93e7737e1e6edf7e4fa1
2019-03-21 14:54:43 +00:00
Anton Hansson
64e23e56dd Merge "Read product/device RRO dirs separately from soong" am: cece1e03af am: df12b23c07
am: b66ccd067d

Change-Id: I2ae235110ef137f1e7b80f0b15f9b8d9375d6624
2019-03-21 04:45:47 -07:00
Anton Hansson
b66ccd067d Merge "Read product/device RRO dirs separately from soong" am: cece1e03af
am: df12b23c07

Change-Id: If27141689086eecfd0286b5bfb8ef745f77ad49e
2019-03-21 04:41:36 -07:00
Anton Hansson
df12b23c07 Merge "Read product/device RRO dirs separately from soong"
am: cece1e03af

Change-Id: I844450ebfaf6b48a8be390349d2794542073ad35
2019-03-21 04:36:24 -07:00
Anton Hansson
cece1e03af Merge "Read product/device RRO dirs separately from soong" 2019-03-21 11:28:19 +00:00
Jiyong Park
88e0980ddf Follow symlink when creating symbols.zip
Due to the runtime APEX, the symbols directory now contains a symlink;
./apex/com.android.runtime -> com.android.runtime.debug (or .release).

Previously, this symlink itself was included in the symbols.zip file.
And this is causing problem to the online stack tool which does not
follow the symlink in the zip file. Instead of fixing the problem in the
stack tool side, this change let the packaging routine to follow the
symlink and copy the files behind the symlink as if they were under a
directory that isn't a symlink. (i.e.
./apex/com.android.runtime/bin/dex2oat is added)

Bug: 120846816
Test: m dist with marlin (flattened) and blueline (non-flattened)
examine symbols.zip file and check that unstripped shared libraries are
found under /apex/com.android.runtime directory
Change-Id: I1d1c787a2e8ab7209410dfa2cff749a7042e21b0
2019-03-21 18:48:16 +09:00
Logan Chien
4a8096ef45 Merge "Update check_elf_file.py for clang-r353983" am: 81589605fd am: 5d00745b0a
am: d5050f82e4

Change-Id: I7ca40fac3d66b2918a0c0b2e808bf5362ceb93a7
2019-03-21 01:29:09 -07:00
Logan Chien
d5050f82e4 Merge "Update check_elf_file.py for clang-r353983" am: 81589605fd
am: 5d00745b0a

Change-Id: I4af4419a7080e37d1b2b045b8a7d906c703ff9d0
2019-03-21 01:24:00 -07:00
Logan Chien
5d00745b0a Merge "Update check_elf_file.py for clang-r353983"
am: 81589605fd

Change-Id: I0bdb631d5eeae4fd834efa5255ae472d76763935
2019-03-21 01:19:49 -07:00
Logan Chien
81589605fd Merge "Update check_elf_file.py for clang-r353983" 2019-03-21 08:05:16 +00:00
Bowgo Tsai
d97130751f Merge "Only build system_other.avbpubkey when AVB is enabled" am: dce018769f am: 20d5f0f821
am: 5ce2f09a8e

Change-Id: I79f0f00969e30d53489f7e5a28423110a94e78e5
2019-03-21 00:24:04 -07:00
Bowgo Tsai
5ce2f09a8e Merge "Only build system_other.avbpubkey when AVB is enabled" am: dce018769f
am: 20d5f0f821

Change-Id: I7e505c8d169612e3eed0a5f54b126271d4af0577
2019-03-21 00:18:52 -07:00
Bowgo Tsai
20d5f0f821 Merge "Only build system_other.avbpubkey when AVB is enabled"
am: dce018769f

Change-Id: Ic65fb56351e3ae39291a22e5fb260b8e966218e6
2019-03-21 00:13:43 -07:00
Bowgo Tsai
dce018769f Merge "Only build system_other.avbpubkey when AVB is enabled" 2019-03-21 07:01:53 +00:00
Bowgo Tsai
8802b7119d Only build system_other.avbpubkey when AVB is enabled
/product/etc/security/avb/system_other.avbpubkey is only needed
when BOARD_AVB_ENABLE is true. This fixes the build error of
Marlin/Sailfish.

Bug: 123611926
Bug: 129029207
Test: make
Change-Id: I73f948d84f91cd6fbe49a2de7bf12e46eebe6ede
2019-03-21 14:26:33 +08:00
Vic Yang
5c38a6234d Merge changes from topic "vndk-no-vendor-variant" am: 30dda1da5e am: 38f68f7a2a
am: 1485ea8707

Change-Id: Ia7eaea708743f9f42f6fe605cb0edba7db36db4d
2019-03-20 21:58:12 -07:00
Vic Yang
a2872a3578 Add module-target-built-files function am: 1b83413b5a am: 00e6eb93c9
am: 9b235bbcd5

Change-Id: Ib4f82e58c3c1f74e196b53854bb5ceb3bb6b3dab
2019-03-20 21:57:17 -07:00
Vic Yang
1485ea8707 Merge changes from topic "vndk-no-vendor-variant" am: 30dda1da5e
am: 38f68f7a2a

Change-Id: Idf7ab78b9ec5ed5e95c1b765dd2a02808d21c3ab
2019-03-20 21:46:43 -07:00
Vic Yang
9b235bbcd5 Add module-target-built-files function am: 1b83413b5a
am: 00e6eb93c9

Change-Id: I907180d6289d925f26717c44a094956c945d20a6
2019-03-20 21:45:57 -07:00
Bowgo Tsai
dc80ab1bf0 Merge "Moving system_other key into product.img" am: 7e87c72fb0 am: 916e876f7a
am: 44446b2a50

Change-Id: Ic704ac1ee1b9e956753d5b67fb39046ac608d721
2019-03-20 21:45:30 -07:00
Bowgo Tsai
44446b2a50 Merge "Moving system_other key into product.img" am: 7e87c72fb0
am: 916e876f7a

Change-Id: If6c70e5e0d4fab45cabb86edc068f2c77d339d54
2019-03-20 21:40:19 -07:00
Vic Yang
38f68f7a2a Merge changes from topic "vndk-no-vendor-variant"
am: 30dda1da5e

Change-Id: I646d55e6195a24530bf22d1e7588b2dd99b27eba
2019-03-20 21:39:57 -07:00