Commit Graph

52075 Commits

Author SHA1 Message Date
Anton Hansson
5d6db45d82 Merge "Enable AB_OTA_UPDATER for mainline" am: 30355b60f7
am: fa96c5c4a0

Change-Id: Ib683460beb5b6ba9f2ed6a11699919b899828108
2019-03-25 02:35:42 -07:00
Anton Hansson
fd946975d0 Merge "Put DEVICE/PRODUCT overlays in different partitions"
am: 94fa0e75cb

Change-Id: I490160177bd0084721212d832dff8c0d721e2e14
2019-03-25 02:32:55 -07:00
Anton Hansson
3632d053d0 Merge "Set file system types for mainline_arm64 partitions"
am: 9274688574

Change-Id: I8cd89bd4b7d5c1b5eb10cb2b270d5125e914e6fe
2019-03-25 02:32:00 -07:00
Anton Hansson
27ade4181f Merge "Make mainline_system_arm64 build only /system"
am: 115292896a

Change-Id: I96e52cb0fb5e4b97a8a21f31c6c52ab210a31cda
2019-03-25 02:31:19 -07:00
Anton Hansson
fa96c5c4a0 Merge "Enable AB_OTA_UPDATER for mainline"
am: 30355b60f7

Change-Id: I1b4aa217952992d9ce4244a88a9b04ba0772af67
2019-03-25 02:30:31 -07:00
Anton Hansson
94fa0e75cb Merge "Put DEVICE/PRODUCT overlays in different partitions" 2019-03-25 09:25:47 +00:00
Anton Hansson
9274688574 Merge "Set file system types for mainline_arm64 partitions" 2019-03-25 09:24:16 +00:00
Anton Hansson
115292896a Merge "Make mainline_system_arm64 build only /system" 2019-03-25 09:23:30 +00:00
Anton Hansson
30355b60f7 Merge "Enable AB_OTA_UPDATER for mainline" 2019-03-25 09:20:32 +00:00
Tao Bao
c27bcf5f66 Merge changes I91bd3dce,I2e941fd9 am: 9a5093e5f9 am: 1ece90be3b
am: 5b8d482ebe

Change-Id: I0506039b36fd051e9f9e33e59391eb8050e4318e
2019-03-24 10:52:16 -07:00
Tao Bao
5b8d482ebe Merge changes I91bd3dce,I2e941fd9 am: 9a5093e5f9
am: 1ece90be3b

Change-Id: I66736e34d4891effe13a25e08dbdef454b222673
2019-03-24 10:48:09 -07:00
Tao Bao
1ece90be3b Merge changes I91bd3dce,I2e941fd9
am: 9a5093e5f9

Change-Id: Ic708931f9ef0ed9a23c8e7146013a7b8dea9e647
2019-03-24 10:44:21 -07:00
Tao Bao
9a5093e5f9 Merge changes I91bd3dce,I2e941fd9
* changes:
  releasetools: Fix alignment issue when signing APEXes.
  releasetools: Fix an issue in handling PRESIGNED APEX keys.
2019-03-24 17:31:55 +00:00
Tao Bao
ffc9a30946 releasetools: Fix alignment issue when signing APEXes.
Previously it was following a wrong order by doing `zipalign` after
calling SignApk, which effectively compromised the signature. This CL
corrects the logic, and follows the same flow as in build system:
 - Pack APEX file;
 - `zipalign -f 4096`;
 - Call SignApk to sign the container with `-a 4096` flag.

Bug: 129148142
Test: Run sign_target_files_apks.py on taimen target_files.zip. Boot the
      image after signing.
Change-Id: I91bd3dce4f45c1891c5e122212a699f4808618fa
(cherry picked from commit 0e06cb0a8b)
2019-03-23 10:27:43 -07:00
Tao Bao
0e06cb0a8b releasetools: Fix alignment issue when signing APEXes.
Previously it was following a wrong order by doing `zipalign` after
calling SignApk, which effectively compromised the signature. This CL
corrects the logic, and follows the same flow as in build system:
 - Pack APEX file;
 - `zipalign -f 4096`;
 - Call SignApk to sign the container with `-a 4096` flag.

Bug: 129148142
Test: Run sign_target_files_apks.py on taimen target_files.zip. Boot the
      image after signing.
Change-Id: I91bd3dce4f45c1891c5e122212a699f4808618fa
2019-03-22 23:25:12 -07:00
Tao Bao
5d816d89eb Merge "releasetools: Fix an issue in handling PRESIGNED APEX keys." 2019-03-22 21:49:47 +00:00
Daniel Norman
19b9fe9fdf Merges dynamic partition misc_info.txt keys from both system and other.
To build a complete list of the dynamic partitions and partitions
groups, we need to merge the contribution from the system and other
target files.

Bug: 127687287
Test: Running merge_target_files.py and observing partition lists are
merged as expected.
Change-Id: I5bb9bd0e3179d48c9bfacdb3aca8253158f61cf6
2019-03-22 14:46:01 -07:00
Tao Bao
1e4cbfaf5c 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
(cherry picked from commit bf3fb024cd)
2019-03-22 14:11:24 -07:00
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