Commit Graph

52075 Commits

Author SHA1 Message Date
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
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
Tao Bao
359862db12 Revert^2 "releasetools: check_target_files_signatures.py checks APEXes."
This reverts commit 5516d37f41.

The previous issue in unzipping non-matching files has been addressed
with commit a49054ca2f2959f50f3188914ec0faebc90ebcbe. This CL rolls
forward to allow dumping container certifcates for APEXes.

Bug: 128848294
Test: Run check_target_files_signatures.py on target_files.zips w/ and
      w/o APEX files.
Change-Id: I662aab3d96fc40ac8e5e206e32b73ac763220b70
2019-03-20 12:40:34 -07:00
Tao Bao
0ff15de32a releasetools: common.UnzipTemp() filters out non-matching patterns.
common.UnzipTemp() calls `unzip` to do the unzipping, which will
complain if there's non-existent names in the given list. Prior to this
CL, callers had to do the work to remove non-existent entries. This CL
filters out the given patterns in common.UnzipTemp()/common.UnzipToDir()
to make callers' works easier.

Bug: 128848294
Test: `m dist` with aosp_taimen-userdebug (which calls
      ota_from_target_files.py on a target_files.zip that doesn't
      contain RADIO/*).
Test: `python -m unittest test_common.CommonZipTest`
Change-Id: I5e741c27ea8d0b8126c398a7e1b56a8deb4a3d7f
2019-03-20 12:38:09 -07:00
Anton Hansson
59b25b4dec Merge "Remove protobuf-cpp-full-rtti from mainline" am: 299d782ecd am: ce0f3e8510
am: 5c915e20b1

Change-Id: I583dab2825c3a7dfe39dc3b4a838fcba92e11608
2019-03-20 11:17:46 -07:00
Anton Hansson
5c915e20b1 Merge "Remove protobuf-cpp-full-rtti from mainline" am: 299d782ecd
am: ce0f3e8510

Change-Id: I7ee20b42139f5aaecb642aae613093716860f454
2019-03-20 11:06:44 -07:00
Anton Hansson
ce0f3e8510 Merge "Remove protobuf-cpp-full-rtti from mainline"
am: 299d782ecd

Change-Id: Ic6471c83379bdba95a1b8289ec22776974854eb6
2019-03-20 11:02:09 -07:00
Anton Hansson
3f0f3d447e Merge "Fix the product-graph target" am: 2cad3f68c2 am: 0e941107d4
am: fe21a3cc76

Change-Id: I7b74cd0ddd6f8f9169ecb2e5b478b461a423797b
2019-03-20 10:57:38 -07: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
Treehugger Robot
299d782ecd Merge "Remove protobuf-cpp-full-rtti from mainline" 2019-03-20 17:47:43 +00: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
Mathieu Chartier
e7aab05998 Merge "Turn off app image startup cache temporarily" 2019-03-20 17:17:37 +00:00
Anton Hansson
0a766e9afa Merge "Refactor generate_enforce_rro" am: bec4aa868a am: f5c74dd470
am: 5784c16fc4

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

Change-Id: I6220b4cfdd403c33076704abb7d670d391bd70e8
2019-03-20 09:21: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
f82f85f0c9 Merge "Add comments and slight refactor auto-RRO logic" am: fce4d099c3 am: 9e8b7550b8
am: 33b3b1f565

Change-Id: Ic7a922d82d7676690cb7907f1e680552730621d5
2019-03-20 09:14:42 -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
597255bc5e Merge "System-specific product sysprops" am: 4ea6474e95 am: ad0e43a4cb
am: 40bf1a78f2

Change-Id: I1e71d3b662dd27c9027129853e21bd5ac55a3e62
2019-03-20 09:08:35 -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
Anton Hansson
bec4aa868a Merge "Refactor generate_enforce_rro" 2019-03-20 15:18:19 +00:00
Anton Hansson
7c718f37f9 Merge "Refactor and further simplify the RRO logic" 2019-03-20 14:35:25 +00:00
Anton Hansson
fce4d099c3 Merge "Add comments and slight refactor auto-RRO logic" 2019-03-20 13:19:56 +00:00