Commit Graph

20859 Commits

Author SHA1 Message Date
Elliott Hughes
21e1dba28b Merge "macOS calls itself Darwin."
am: 33dfa52cdd

Change-Id: Ia00d0001106daaecf6b3a4b9b377c1663fd31bd9
2019-08-23 10:10:12 -07:00
Treehugger Robot
33dfa52cdd Merge "macOS calls itself Darwin." 2019-08-23 16:45:07 +00:00
Isaac Chen
5c40e0b628 Merge "Include misc_info.txt for super.img in dist"
am: da8bf47e68

Change-Id: I2982e396ffbf01c5cbed949773a68afa2b65c090
2019-08-23 00:58:36 -07:00
Isaac Chen
da8bf47e68 Merge "Include misc_info.txt for super.img in dist" 2019-08-23 07:35:52 +00:00
Elliott Hughes
a8368efe51 macOS calls itself Darwin.
Test: uname
Change-Id: Id3ce8614869e68c15666051af14321f597d6ae0f
2019-08-22 13:38:28 -07:00
Dan Willemsen
86be07669f Merge "Remove package-stats.txt"
am: 1211130c92

Change-Id: I6be259692a3a25934f30595b7f23177c4f6b62bb
2019-08-21 23:51:21 -07:00
Treehugger Robot
1211130c92 Merge "Remove package-stats.txt" 2019-08-22 06:40:11 +00:00
Isaac Chen
52cc60ca15 Include misc_info.txt for super.img in dist
Include the misc_info.txt in "dist_files" so we can recreate a new
mixed super image (system and vendor images from different builds)
later in the test pipeline.

The misc_info.txt for products with BOARD_SUPER_IMAGE_IN_UPDATE_PACKAGE
set to true is removed from their update packages (essentially, reverts
aosp/976069) since the super_misc_info.txt created here can be used.

Bug: 139404128
Test: $ lunch aosp_x86-userdebug
      $ m dist
      $ diff $OUT_DIR/dist/super_misc_info.txt $OUT/misc_info.txt

Change-Id: Iad1ff981124a19933b0b575bc99941e0fc3813a7
2019-08-22 13:22:06 +08:00
Jeongik Cha
5f1eca2482 Merge "SYSTEM_EXT supports executables"
am: 6d52157f9d

Change-Id: I895dec8ff661e914fe35bc20e6a1ab1762037f9b
2019-08-21 18:31:10 -07:00
Treehugger Robot
6d52157f9d Merge "SYSTEM_EXT supports executables" 2019-08-22 01:07:20 +00:00
Dan Albert
68e9a68014 Merge "Link libc++demangle with libc++ for the device."
am: 400c218219

Change-Id: I3f736121bf894a57a6d066672fb8a61d08adbce5
2019-08-21 17:25:35 -07:00
Peter Collingbourne
074651ba13 Merge "Only include the "tools" and "testcases" subdirectories in android-cts.zip."
am: 0f9ac40dd6

Change-Id: Iccd2f3cbcad562a0fa7a089cb48f10db1ace7177
2019-08-21 17:24:25 -07:00
Treehugger Robot
400c218219 Merge "Link libc++demangle with libc++ for the device." 2019-08-21 23:54:48 +00:00
Treehugger Robot
0f9ac40dd6 Merge "Only include the "tools" and "testcases" subdirectories in android-cts.zip." 2019-08-21 23:45:47 +00:00
Roland Levillain
0a416ce07e Merge "Rename Soong variable FlattenApex as Flatten_apex."
am: 57b8a7cf66

Change-Id: I0ace2508ef1e9676073b808e10310a0d45694d4c
2019-08-21 13:13:46 -07:00
Roland Levillain
57b8a7cf66 Merge "Rename Soong variable FlattenApex as Flatten_apex." 2019-08-21 19:55:47 +00:00
Dan Willemsen
d7994816c1 Remove package-stats.txt
I can't find any remaining users of this functionality.

Test: codesearch; treehugger
Change-Id: I63b079b381211b743baa293267c992d9b2eadcf9
2019-08-21 12:36:14 -07:00
Peter Collingbourne
bbddfcf7ba Only include the "tools" and "testcases" subdirectories in android-cts.zip.
Without this, we can end up packaging log files from previous CTS runs in
the zip file. If the names of those log files contain whitespace characters,
it can result in a build failure.

Change-Id: Id96d1915a03b6a715acfdc212c9b2d6f28045baa
2019-08-21 12:31:41 -07:00
Jeongik Cha
6a5e9a21ef SYSTEM_EXT supports executables
Because TARGET_OUT_SYSTEM_EXT_EXECUTABLES have been omitted, we cannot
install any executables in system_ext.
So fix it.

Test: set system_ext_specific true in some executable, and then check if
it is installed in /system_ext/bin
Bug: 139719550

Change-Id: I1bc7a2e6a7c25ec4b5b1ea6358ba8d3e1ae6331b
2019-08-20 19:24:43 +09:00
Paul Trautrim
bb78e6bfb8 Merge "Add PRODUCT_BUILD_VBMETA_IMAGE to control vbmeta generation"
am: 23b46e54ac

Change-Id: Idc47cbfa3c54faa3656d2df156fef55ba5546ebd
2019-08-19 17:43:39 -07:00
Paul Trautrim
23b46e54ac Merge "Add PRODUCT_BUILD_VBMETA_IMAGE to control vbmeta generation" 2019-08-20 00:07:35 +00:00
nelsonli
7dc1cbe13c Merge "VTS: Add vts-core to the dependency of tests"
am: 1413925ac4

Change-Id: I6a2dd9858e0a9c30d1d08b0815c5fbc54e568c5c
2019-08-15 18:48:35 -07:00
Treehugger Robot
1413925ac4 Merge "VTS: Add vts-core to the dependency of tests" 2019-08-16 01:21:02 +00:00
Tao Bao
22fa2f20ae Merge "Stop packing system/update_engine/scripts."
am: d994b4c062

Change-Id: Iaa3633d3c087d3962d3408c4aefe33037f68f430
2019-08-15 16:44:43 -07:00
Tao Bao
d994b4c062 Merge "Stop packing system/update_engine/scripts." 2019-08-15 23:09:21 +00:00
Colin Cross
fb4c69eebc Merge "Make javamicro a plugin"
am: c61d0f966b

Change-Id: Ie4a9eca7b0fc9043f777947cf2cf3898f37c7c24
2019-08-15 13:13:23 -07:00
Tao Bao
07997f1bb4 Stop packing system/update_engine/scripts.
We once attempted to use them (by importing from releasetools scripts)
to parse payload. Due to the dependency on google.protobuf, we have
switched to delta_generator instead (commit 750385e4).

Bug: 65261072
Test: `m -j otatools-package`; and check the related scripts are not
      included.
Change-Id: Iaa8bcb0e2792e48512e1b8db29869db875ba8dc9
2019-08-15 12:10:05 -07:00
Treehugger Robot
c61d0f966b Merge "Make javamicro a plugin" 2019-08-15 18:18:38 +00:00
Remi NGUYEN VAN
ff51a362fd Merge "Add a product build var for mainline module certs"
am: a7832d5543

Change-Id: I00c77685a3b630049a2f578258d54cdc6e973e3a
2019-08-15 01:11:22 -07:00
Treehugger Robot
a7832d5543 Merge "Add a product build var for mainline module certs" 2019-08-15 07:43:46 +00:00
Treehugger Robot
c2852177bb Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master" 2019-08-15 06:13:48 +00:00
Tao Bao
27480a0cf4 Merge "Makefile uses add_img_to_target_files module." 2019-08-15 04:27:08 +00:00
Hsin-Yi Chen
a489b755a0 Merge "Add tags to lsdump_paths.txt"
am: 7205361315

Change-Id: I4874b39acd4727e6969c8ddb235c773c46ee8972
2019-08-14 19:44:40 -07:00
Hsin-Yi Chen
7205361315 Merge "Add tags to lsdump_paths.txt" 2019-08-15 02:20:30 +00:00
Bill Peckham
861ffd1588 Merge "Avoid adding VINTF manifest fragment more than once."
am: fd25038f8a

Change-Id: I44c12257269e039c78f20330fa5713775fec3b65
2019-08-14 16:04:02 -07:00
Tao Bao
c1966a8bdd Makefile uses add_img_to_target_files module.
Also pack additional tools into otatools.zip.

Bug: 63866463
Test: TreeHugger
Test: `m -j otatools-package`; Check the packed tools.
Change-Id: Ia21d143ca42b1cae8f04b5f0e0cdf6b719312117
(cherry picked from commit 1cf8bf0c14)
2019-08-14 10:44:53 -07:00
Tao Bao
1cf8bf0c14 Makefile uses add_img_to_target_files module.
Also pack additional tools into otatools.zip.

Bug: 63866463
Test: TreeHugger
Test: `m -j otatools-package`; Check the packed tools.
Change-Id: Ia21d143ca42b1cae8f04b5f0e0cdf6b719312117
Merged-In: Ia21d143ca42b1cae8f04b5f0e0cdf6b719312117
2019-08-14 10:34:59 -07:00
nelsonli
e7b71a18a4 VTS: Add vts-core to the dependency of tests
Bug: 137921421
Test: (1) m tests
      (2) check vts-core-tests.zip

For migrating most existing VTS test to executable by Base TradeFed, we have to
create vts-core suite and test all of the modules in vts-core first.
And add the packaging rules for vts-core suite.

Bug: 137921421
Change-Id: Ifc92db205c78db98abf704aa6dfa50f1f77e983d
2019-08-14 09:47:21 +08:00
Colin Cross
869febddb9 Make javamicro a plugin
Treat LOCAL_PROTOC_OPTIMIZE_TYPE := javamicro as a plugin by
explicitly passing the path to protoc-gen-javamicro.  This allows
removing the javamicro customizations from the core plugin code.

Bug: 117607748
Test: m checkbuild
Change-Id: I199f47a64a454594a2fff4c5580c53fd17e0bdee
2019-08-13 16:58:45 -07:00
Xin Li
bcb39c6c34 DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master
Bug: 139369544
Change-Id: I205bd2801280b265407a31ec283c2ff9265b9a0a
2019-08-13 16:43:29 -07:00
Bill Peckham
6733381fce Avoid adding VINTF manifest fragment more than once.
In the case of building a multilib library that defines LOCAL_VINTF_FRAGMENTS,
the previous code would create duplicate rules for the fragment. This change
uses the my_vintf_new_installed variable (which may be empty) to avoid the
duplication.

Bug: 139268165
Test: Verify that build warnings are gone, yet VINTF fragment still installed.
Change-Id: I579ec650019a29a6a105118ad5e5ae9376e8d9bc
2019-08-13 16:05:34 -07:00
Dan Albert
d892b63a1d Link libc++demangle with libc++ for the device.
libc++demangle provides __cxa_demangle, which used to be a part of
libc++.so but is being moved out to save on resources since very few
libraries need it.

Test: make checkbuild
Bug: http://b/138245375
Change-Id: I677006dbbe87ccf2dd4df182114d2a6b985e3c00
2019-08-13 13:15:04 -07:00
Ramy Medhat
eef0efadb3 Merge "Add labels to rewrapper cc compile action. Prevent ccwrapper from being used in links."
am: f51a70b009

Change-Id: I08921d50243c3984a2edd518750465b58896b4d9
2019-08-13 10:48:10 -07:00
Ramy Medhat
f51a70b009 Merge "Add labels to rewrapper cc compile action. Prevent ccwrapper from being used in links." 2019-08-13 17:17:05 +00:00
android-build-team Robot
3ca130e871 Make change and version bump to PPRL.190801.002
Change-Id: I2f623d5f6e2a908aee4b3988df20179a3095a330
2019-08-13 16:39:58 +00:00
Roland Levillain
7672ab85d9 Rename Soong variable FlattenApex as Flatten_apex.
This is so that it can be used as a Soong/Blueprint property.

Test: m
Bug: 139277987
Change-Id: I009817e040994738814c92ee007aec9ef2cfa838
2019-08-13 15:07:44 +01:00
Paul Trautrim
4e14323a31 Add PRODUCT_BUILD_VBMETA_IMAGE to control vbmeta generation
In line with the existing PRODUCT_BUILD_*_IMAGE variables, add a flag to
control whether vbmeta is generated.

Bug: 139328573
Test: manual
Change-Id: Id71026f9b0de9019e82e8ef594e718a4b0f3628f
2019-08-13 16:43:39 +09:00
Ramy Medhat
e5839f912b Add labels to rewrapper cc compile action. Prevent ccwrapper from being
used in links.

Test: Built aosp-arm64_eng with and without USE_RBE=1

Change-Id: I8d04069219a9467c3de9a028eb68e3115173f1e2
2019-08-12 14:13:31 -04:00
vichang
940002a285 Merge "Add new core-icu4j after separating icu4j from core-libart"
am: ba6135bd80

Change-Id: Iba62deb4e2bb8c906fd30baa074ba43a8d19ac62
2019-08-12 09:11:26 -07:00
vichang
ba6135bd80 Merge "Add new core-icu4j after separating icu4j from core-libart" 2019-08-12 15:36:44 +00:00