Commit Graph

17716 Commits

Author SHA1 Message Date
Treehugger Robot
36ea50d760 Merge "Add "hwaddress" sanitizer." 2018-08-20 23:22:35 +00:00
Chih-Hung Hsieh
a4c5a37636 Merge "Use multiple globs/emails in per-file syntax"
am: 5d1926376e

Change-Id: I8de7260370a6f3f1fc7ae7cf9241c57631dd608a
2018-08-20 15:50:11 -07:00
Evgenii Stepanov
8841a7f681 Add "hwaddress" sanitizer.
Build/make support for "hwaddress".

* HWASan supports static binaries, unlike ASan.
* It will be used to build libc. Since static libraries get a .hwasan
  suffix in soong, the logic that moves libc-and-friends to the end
  of the link command line has to be updated.

Bug: 112438058
Test: manual, part of a bigger patch set

Change-Id: I3b52336841012622771a88ba161916bc33071dfe
2018-08-20 14:59:36 -07:00
Chih-Hung Hsieh
f77c7f75e5 Use multiple globs/emails in per-file syntax
Bug: 112259427
Test: tools/checkowners.py -c -v OWNERS */OWNERS */*/OWNERS
Change-Id: I0e2c2c64a23df360fbe7691c4336ca04099fba13
2018-08-20 14:16:04 -07:00
Yifan Hong
35be6ca8f2 Reland "s/PRODUCT-SERVICES/PRODUCT_SERVICES/g"
Test: builds
This reverts commit 87021065b9.

Reason for revert: reland CL

Change-Id: Ic88c2bd612ad7a19d88686b2907c812bd586ee35
Merged-In: Ic88c2bd612ad7a19d88686b2907c812bd586ee35
2018-08-20 10:44:59 -07:00
Dario Freni
924af7d4dd s/product-services/product_services/g
Attempting to reduce the number of different spellings we have for
"product services" partition in the codebase.

Bug: 112431447
Test: m
Change-Id: I6debd3f5f5abc4bd1e22f2ef11c5fe131915976c
Merged-In: I6debd3f5f5abc4bd1e22f2ef11c5fe131915976c
2018-08-20 10:44:59 -07:00
Colin Cross
09935c266b Merge changes from topic "test_suite_harness_bp"
am: c9f31dff01

Change-Id: I132397729b490d71e9466a18a505d49bf04c81be
2018-08-20 10:36:07 -07:00
Colin Cross
8a670d6c61 Move general-tests intermediates out of $(PRODUCT_OUT)
am: 38f16dcf4e

Change-Id: I5e4048d82a044ae587413f5c535a2893cb76fa25
2018-08-20 10:35:16 -07:00
Colin Cross
964748505d Rename general-tests-* variables to general_tests_*
am: 50d1c22efb

Change-Id: Ic4698cee14ef532a7dde7235ad662f6e4b6809ab
2018-08-20 10:34:23 -07:00
Colin Cross
b0d376f66b Add tools jars to general-tests.zip
Some non-tests were marked with
LOCAL_COMPATIBILITY_SUITE := general-tests
in order to get them into general-tests.zip. Soong is attempting to
only allow the test_suites property on tests.  Specify the tools
needed in the test suite in general-tests.mk instead, the same
way cts.mk does.

Bug: 112654980
Test: m checkbuild
Test: tradefed/general_tests_zip
Change-Id: Ied7a6b2f956b84659c3edcf4dd866a8cd936bedf
2018-08-17 22:59:12 -07:00
Colin Cross
38f16dcf4e Move general-tests intermediates out of $(PRODUCT_OUT)
Move intermediate files used to generate general-tests.zip out of
$(PRODUCT_OUT) to better isolate the rule.

Test: m checkbuild
Change-Id: I5f3d204cc4e36b6c6670aabe0e63bce8597afd4b
2018-08-17 22:56:24 -07:00
Colin Cross
50d1c22efb Rename general-tests-* variables to general_tests_*
Make supports dashes in variable names, but underscores are more
common.  Also use a private variable for general_tests_list_zip,
and clear local variables at the end of the file.

Test: m checkbuild
Change-Id: I8fd968d9e674dbc630bdb71ddd375448b6ada5ed
2018-08-17 22:54:45 -07:00
Colin Cross
0ca736a231 Merge changes I44f7a486,I136e6fa7
am: fe411d1860

Change-Id: I0b090fdb574016afd281ad32669677a1082b14c1
2018-08-17 17:12:23 -07:00
Treehugger Robot
fe411d1860 Merge changes I44f7a486,I136e6fa7
* changes:
  Add jni shared libraries to java soong_to_convert problems
  Fix java soong_to_convert data
2018-08-17 23:11:56 +00:00
Shawn Yang
7a04202f5f Merge "Revert "s/PRODUCT-SERVICES/PRODUCT_SERVICES/g""
am: 68883e0717

Change-Id: I91e2be76da96f0c841fe77aeb350d5d514090c79
2018-08-17 14:03:59 -07:00
Treehugger Robot
68883e0717 Merge "Revert "s/PRODUCT-SERVICES/PRODUCT_SERVICES/g"" 2018-08-17 20:32:18 +00:00
Sasha Smundak
1c31492ce0 Do not call sort when setting ALL_DEPS.MODULES.
This particular invocation of 'sort' is expensive (it may amount to 30%
of the total ckati execution time for the clean build).

Test: verify that the result of running 'm nothing' is unchanged,
verify that the result of running 'm -j deps-license
PROJ_PATH=packages/app/% DEP_PATH=external/%' is unchanged.

Change-Id: If1cfddd4dee24559a26ecceebdf03cf49cc5a367
2018-08-17 12:41:24 -07:00
Tianjie Xu
ad7215eed7 Merge "Generates the care_map.txt in protobuf format"
am: 9be301eb66

Change-Id: I6640be1e7ef5197578404d02c5fb4a8563facc50
2018-08-17 12:12:52 -07:00
Shawn Yang
87021065b9 Revert "s/PRODUCT-SERVICES/PRODUCT_SERVICES/g"
This reverts commit 77c778c040.

Reason for revert: git-master break on 4960355

Change-Id: I2fd272c63ef496067f12852bcf98ffc1194c54bf
2018-08-17 19:02:08 +00:00
Nan Zhang
2c24d09de7 Merge "Change dependency name to api-stubs-docs_annotations.zip"
am: 075435035f

Change-Id: I14767c8383cd742e97cf8bfb951ff951d537bb82
2018-08-17 11:53:27 -07:00
Tianjie Xu
ccbae48ac5 Generates the care_map.txt in protobuf format
Call the host binary care_map_generator to generate the care_map in
protobuf format. The parsing part of proto messages has already been
supported in the update_verifier.

Bug: 77867897
Test: unittests pass; run add_image_to_target_files
Change-Id: I40d3184b4b5c48a6dd55203afc84cca73d5765e9
2018-08-17 17:39:00 +00:00
Nan Zhang
075435035f Merge "Change dependency name to api-stubs-docs_annotations.zip" 2018-08-17 16:53:12 +00:00
Colin Cross
dcc8ec310f Add jni shared libraries to java soong_to_convert problems
Soong doesn't support LOCAL_JNI_SHARED_LIBRARIES yet, add it to the
problems list.

Bug: 80095087
Test: examine soong_to_convert.txt
Change-Id: I44f7a486b1e9de276416f74a4cb2b7f4eafce4ef
2018-08-16 22:58:14 -07:00
Colin Cross
7a504334cd Fix java soong_to_convert data
soong_to_convert looks for modules with no unconverted deps, but
the list of converted modules was not being updated for java and
app prebuilts.  That meant soong_to_convert only reported modules
with no deps at all.

Test: examine soong_to_convert.txt
Change-Id: I136e6fa74153a80df5ecd767642bb2feb2ddb9dc
2018-08-16 22:55:43 -07:00
Dario Freni
eef5d98b9b Merge "s/PRODUCT-SERVICES/PRODUCT_SERVICES/g"
am: 28156406b4

Change-Id: Idd9cd24e0d7f445ce55e615d69104fa84541a85c
2018-08-16 17:53:24 -07:00
Dario Freni
28156406b4 Merge "s/PRODUCT-SERVICES/PRODUCT_SERVICES/g" 2018-08-17 00:43:02 +00:00
Yu Shan
492e0647fb Merge "Use prebuilt nanopb_generator.py."
am: fb5314a2a9

Change-Id: I56c72d4d941188896694de4d75d93e8dad998b01
2018-08-16 17:30:22 -07:00
Dario Freni
6f0129d237 Merge "Add a way to override LOCAL_PRODUCT_MODULE."
am: 81ad1ef95c

Change-Id: Ifa61e631dd4526480ae91438ee9099bf1864c006
2018-08-16 17:29:46 -07:00
Dan Willemsen
2e9afca9c7 Merge "Make duplicate COPY_HEADERS an error"
am: 7911fd3b91

Change-Id: Ie8068bf3b3cc92eb4114493f020e56352bd1c83b
2018-08-16 17:28:47 -07:00
Dario Freni
77c778c040 s/PRODUCT-SERVICES/PRODUCT_SERVICES/g
Attempting to reduce the number of different spellings we have for
"product-services" in the codebase.

Bug: 112431447
Test: m
Change-Id: Iec531122297cf4b86ff8601732d4ab7ccf5c2183
2018-08-17 00:28:17 +01:00
Yu Shan
10be65dbc1 Use prebuilt nanopb_generator.py.
Use prebuilt nanopb_generator.py to avoid using the incompatible
version of libprotobuf-python on host.

Test: Local build tests.
Bug: 111798740
Change-Id: Iabca07eb13dbab183fbf85cb0dfe04ce33aa660c
(cherry picked from commit fa47daa47d)
2018-08-16 16:07:05 -07:00
Dario Freni
f31bc450d2 Add a way to override LOCAL_PRODUCT_MODULE.
This CL introduces the product variable
PRODUCT_FORCE_PRODUCT_MODULES_TO_SYSTEM_PARTITION, which can contain a
list of module names to be "unmarked" from being LOCAL_PRODUCT_MODULE.

If a module name is included in this variable and if that module is
declared as LOCAL_PRODUCT_MODULE, the setting will be overriden and the
module will be installed in /system. This is useful to control this
behavior on a device-specific level.

Test: m; and checked resulting output.
Bug: 110072687
Change-Id: Iaab663a7ed757c1dd4f16169b0ac3d71650014d2
2018-08-16 18:39:12 +01:00
Treehugger Robot
7911fd3b91 Merge "Make duplicate COPY_HEADERS an error" 2018-08-16 16:33:21 +00:00
Bowgo Tsai
0ea2b1494f Merge "Add support for /odm partition"
am: c272a99b5c

Change-Id: I13e627cee909a09e0ada9f841f72c79803e765b7
2018-08-15 20:55:08 -07:00
Treehugger Robot
c272a99b5c Merge "Add support for /odm partition" 2018-08-16 03:37:36 +00:00
Dan Willemsen
346034da97 Merge "Default BUILD_BROKEN_ANDROIDMK_EXPORTS to false"
am: 78f95fa7ef

Change-Id: I5b6d69b5d2ea61f306474dc37b544d99971b0c3b
2018-08-15 17:18:40 -07:00
Dan Willemsen
7f9bd56b8a Make duplicate COPY_HEADERS an error
Test: on internal device that has warnings, test with
BUILD_BROKEN_DUP_COPY_HEADERS true and unset.
Test: build_test on downstream branches
Change-Id: I2cebd99b10f13fb75167dc8370ba762f94c41c2a
2018-08-15 15:08:15 -07:00
Dan Willemsen
738368dff5 Default BUILD_BROKEN_ANDROIDMK_EXPORTS to false
See https://android.googlesource.com/platform/build/+/master/Changes.md#export_keyword

Bug: 73959648
Test: build/soong/build_test.bash on downstream branches
Change-Id: I120e0cc381bae71101ec9ca48ee7cbe8a0b9615f
2018-08-15 20:41:56 +00:00
Tao Bao
da29ba7fe8 Merge "Remove the hack that uses INSTALLED_RAMDISK_TARGET as INSTALLED_BOOTIMAGE_TARGET."
am: 1fa790cb53

Change-Id: Ib850ff31e8edbf64c6c68577f78890958ec6de75
2018-08-15 11:05:29 -07:00
Tao Bao
1fa790cb53 Merge "Remove the hack that uses INSTALLED_RAMDISK_TARGET as INSTALLED_BOOTIMAGE_TARGET." 2018-08-15 17:59:47 +00:00
Ralph Nathan
6fa4b60c21 Merge "Allow products to define their own hidden api stubs"
am: e68ede57d7

Change-Id: Idb0bb0c7f2ac2ca848da830b90ceebe128869430
2018-08-15 10:35:10 -07:00
Tao Bao
381e9ff950 Merge "Reland "Generate the list of installed files in recovery image.""
am: 5d1b46784d

Change-Id: I3ee636b4b5f4131c8cb84e3f272a63ac58b6250c
2018-08-15 10:02:58 -07:00
Ralph Nathan
b8fb0de02f Allow products to define their own hidden api stubs
This enables other verticals/products to expand the list of APIs that
apps can call on those devices.

Bug: 112190341
Test: local test with app
Merged-In: I4dc983273a1beb83d0b81ab026945880a10bbd8c
Change-Id: I4dc983273a1beb83d0b81ab026945880a10bbd8c
(cherry picked from commit f9bf755d0a)
2018-08-15 17:51:55 +01:00
Tao Bao
5d1b46784d Merge "Reland "Generate the list of installed files in recovery image."" 2018-08-15 16:37:12 +00:00
Tao Bao
10fc949873 Reland "Generate the list of installed files in recovery image."
This reverts commit 60a47827cb to reland
the change that generates installed-files-recovery.{txt,json}.

This CL addresses the previous issue by explicitly depending on
INSTALLED_BOOTIMAGE_TARGET or INSTALLED_RECOVERYIMAGE_TARGET. This
avoids the race condition between INSTALLED_{BOOT,RECOVERY}IMAGE_TARGET
and INSTALLED_FILES_FILE_RECOVERY. As a result, it will also give a
complete list of files that are installed to recovery ramdisk image.

Bug: 30414428
Test: `m dist` with aosp_taimen-userdebug. Check the generated files of
      $OUT/installed-files-recovery.{txt,json}.
Change-Id: I8bde0dafda7d8ed9c4113dc82553c4edc7f79548
2018-08-14 23:32:32 -07:00
Colin Cross
22bb86a86b Merge "Remove proguard support"
am: 72150c147e

Change-Id: I3d7b79295f0c162bb34ebdfd8f34e0735e3de2bb
2018-08-14 19:44:20 -07:00
Colin Cross
59991c71a0 Merge changes from topic "atest_java_test"
am: 1d07fbb090

Change-Id: Iac13e55edf4e96126bb6845ef9747c4c1088fcbf
2018-08-14 19:36:33 -07:00
Colin Cross
56be4aecbc Allow Soong to autogenerate test configs
am: e3a4df80c8

Change-Id: I717d8fc8f18a32a65846a020caf20a0d1975c92e
2018-08-14 19:35:41 -07:00
yangbill
7edbae731d Merge "ATest: Host native test config auto-gen support."
am: 56d08ec834

Change-Id: I78a6c5e4dcd9349b8b89be77e9090cb8a8df1fa4
2018-08-14 19:34:34 -07:00
Treehugger Robot
72150c147e Merge "Remove proguard support" 2018-08-15 01:14:45 +00:00