Commit graph

18887 commits

Author SHA1 Message Date
Sasha Smundak
20f8f5c6ee Merge "Eliminate ENABLE_DEFAULT_TEST_LOCATION as it is always true" am: d7060a50f9
am: aa2eb553d8

Change-Id: I5aebaa6c8a4bcf203c4e930039b4476d356cfdfa
2019-03-26 15:27:16 -07:00
Sasha Smundak
aa2eb553d8 Merge "Eliminate ENABLE_DEFAULT_TEST_LOCATION as it is always true"
am: d7060a50f9

Change-Id: Ice1a9ef05eadd59d45324c17a1c6e8f71f271828
2019-03-26 14:19:30 -07:00
Treehugger Robot
d7060a50f9 Merge "Eliminate ENABLE_DEFAULT_TEST_LOCATION as it is always true" 2019-03-26 20:22:37 +00:00
Daniel Norman
2d5f9a0285 Merge "Only call make_recovery_patch when BUILDING_SYSTEM_IMAGE." am: b455273444
am: 7100e93233

Change-Id: I1c925936c6d5992bd9544e87ab59836f46090ebb
2019-03-25 16:29:24 -07:00
Daniel Norman
7100e93233 Merge "Only call make_recovery_patch when BUILDING_SYSTEM_IMAGE."
am: b455273444

Change-Id: I7eb9f6686af9750e9960de66f954087f4551416f
2019-03-25 16:25:20 -07:00
Sasha Smundak
da25b691d3 Eliminate ENABLE_DEFAULT_TEST_LOCATION as it is always true
Bug: 117224272
Test: treehugger
Change-Id: Idd47ead31fcd89dbf728f140dc3353e5013ba352
2019-03-25 13:26:03 -07:00
Daniel Norman
adf8096c77 Only call make_recovery_patch when BUILDING_SYSTEM_IMAGE.
The recovery patch gets put in the SYSTEM directory. Placing the
recovery patch here doesn't make sense when not building the system
image, as is the case for merged (system + vendor) builds.

Bug: 128838154
Test: Running make droid dist for a device target that sets PRODUCT_BUILD_SYSTEM_IMAGE to false.
Change-Id: Ib5ce8c8490024199f82d0c093e9a7ae2de5f71f5
2019-03-25 18:34:30 +00:00
Anton Hansson
691c979b62 Merge "Put DEVICE/PRODUCT overlays in different partitions" am: 94fa0e75cb
am: fd946975d0

Change-Id: Id4f8e8ce0ad6448d71b7a619805c4bae06cfcbca
2019-03-25 02:38:24 -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
94fa0e75cb Merge "Put DEVICE/PRODUCT overlays in different partitions" 2019-03-25 09:25:47 +00: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
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
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
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
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
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
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
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
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
Vic Yang
00e6eb93c9 Add module-target-built-files function
am: 1b83413b5a

Change-Id: I91a2d2fa1642bef1564b6efde554df55ffd2f8aa
2019-03-20 21:38:59 -07:00
Bowgo Tsai
916e876f7a Merge "Moving system_other key into product.img"
am: 7e87c72fb0

Change-Id: I29ba3d2056fca68a356cb26a8e17b29d415ed08e
2019-03-20 21:36:24 -07:00
Vic Yang
30dda1da5e Merge changes from topic "vndk-no-vendor-variant"
* changes:
  Add support for no-vendor-variant VNDK
  Add module-target-built-files function
2019-03-21 04:30:47 +00:00
Treehugger Robot
7e87c72fb0 Merge "Moving system_other key into product.img" 2019-03-21 04:26:21 +00:00
Anton Hansson
fe21a3cc76 Merge "Fix the product-graph target" am: 2cad3f68c2
am: 0e941107d4

Change-Id: I532416a6c390a2e0ea0414a19049daedff1ca003
2019-03-20 10:54:26 -07:00
Anton Hansson
0e941107d4 Merge "Fix the product-graph target"
am: 2cad3f68c2

Change-Id: I02d010e837752ef4483a0c0fab06b3f5a8f863fa
2019-03-20 10:49:18 -07:00
Anton Hansson
2cad3f68c2 Merge "Fix the product-graph target" 2019-03-20 17:31:41 +00:00
Vic Yang
51512c558c Add support for no-vendor-variant VNDK
When TARGET_VNDK_USE_CORE_VARIANT is set to true, the vendor variant of
VNDK libraries are by default not installed.  Instead, the core variant
will be used by vendor binaries at runtime.

To ensure the core variant of VNDK libraries are installed, we also add
a flag LOCAL_VNDK_DEPEND_ON_CORE_VARIANT to indicate that the vendor
variant module depends on the core variant module.  This flag should be
set by Soong for all VNDK libraries without the vendor variant
installed.  When the flag is set, the vendor variant binary is also
compared against the core variant binary to ensure they are
functionally identical.

As we are merging the two variants for some libraries, we need a new
link type to denote a module is usable as both native:vndk and
native:platform.  We add native:platform_vndk for this.

Bug: 119423884
Test: With the corresponding Soong change, build with
      TARGET_VNDK_USE_CORE_VARIANT set to true.
Test: Add a dummy VNDK library and a dummy vendor binary that depends
      on it.  Build with no-vendor-variant VNDK and check the core
      variant is installed.
Test: Add conditional compilation based on __ANDROID_VNDK__ in the
      dummy VNDK library and check build fails.

Change-Id: I40000f2728e8193212113c1ee950e9d697f2d40d
2019-03-20 10:23:04 -07:00
Vic Yang
1b83413b5a Add module-target-built-files function
This is similar to module-built-files, except that it only returns
files built for the target, not the host.

Bug: 119423884
Test: Build with the no-vendor-variant VNDK change that uses this
      function.

Change-Id: I2a3d99003b05999eae01c0b90bb62b5263d65592
2019-03-20 10:22:21 -07:00
Anton Hansson
5784c16fc4 Merge "Refactor generate_enforce_rro" am: bec4aa868a
am: f5c74dd470

Change-Id: Id4ce71a884dda5a5abf6b131072a13f751b839cf
2019-03-20 09:18:39 -07:00
Anton Hansson
79ff9538c7 Merge "Refactor and further simplify the RRO logic" am: 7c718f37f9
am: 5809544a5a

Change-Id: Ib2de01d13b835d4a7dcd99eef37514e24c414c6c
2019-03-20 09:15:57 -07:00
Anton Hansson
f5c74dd470 Merge "Refactor generate_enforce_rro"
am: bec4aa868a

Change-Id: I1f616f8020f85df60b89cdc3d0f489e9111d0454
2019-03-20 09:10:12 -07:00
Anton Hansson
33b3b1f565 Merge "Add comments and slight refactor auto-RRO logic" am: fce4d099c3
am: 9e8b7550b8

Change-Id: Ie6a6577eeb9eb9694968d10dd1cde1ea874da436
2019-03-20 09:09:25 -07:00
Anton Hansson
5809544a5a Merge "Refactor and further simplify the RRO logic"
am: 7c718f37f9

Change-Id: I90af301f8a7fd4713d6f8734080ce73128219fcf
2019-03-20 09:06:45 -07:00
Anton Hansson
9e8b7550b8 Merge "Add comments and slight refactor auto-RRO logic"
am: fce4d099c3

Change-Id: Ie1c5bfcddaabb8315cd4971a21900fddeba1e426
2019-03-20 08:57:07 -07:00
Anton Hansson
40bf1a78f2 Merge "System-specific product sysprops" am: 4ea6474e95
am: ad0e43a4cb

Change-Id: If4199330a673fd62199d3435e57b5298378a0e3a
2019-03-20 08:56:58 -07:00
Anton Hansson
ad0e43a4cb Merge "System-specific product sysprops"
am: 4ea6474e95

Change-Id: Ic86991b8facce69736a1bb484d095b3a132cbd1d
2019-03-20 08:48:31 -07:00