Commit Graph

18402 Commits

Author SHA1 Message Date
Anton Hansson
0de30815ff Merge "Fix dump-products." 2018-08-22 16:58:13 +00:00
Anton Hansson
ae6bf49575 Merge "Make FULL_BUILD not set for the dont_bother case." 2018-08-22 16:57:48 +00:00
Chih-Hung Hsieh
4275dcf866 Define CLANG_TIDY_UNKNOWN_CFLAGS in tidy.mk
* Moved from build/soong because the list is used only in make rules.

Bug: 111885396
Test: build with WITH_TIDY=1
Change-Id: I6ca7420e7ed1e342a5b92996724c6659a406d5ae
2018-08-22 09:21:53 -07:00
Anton Hansson
9b8e6cf067 Fix dump-products.
m dump-products didn't print anything useful prior to this change,
however this was visible in the terminal:
15:18:58 Error dumping make vars: Failed to parse make line: "==== build/target/product/aosp_arm.mk ===="

Convert this goal to normal target instead, which apart from making
$(info) actually print something, considers the build successful
when running "m dump-products" too. This makes it easier to run with
e.g. multiproduct_kati.

Test: m dump-products
Change-Id: I944c87cd0fd323687690b0fcc3c37a8f37242cd9
2018-08-22 10:49:18 +01:00
Anton Hansson
85d8ce044f Make FULL_BUILD not set for the dont_bother case.
If dont_bother is set, we're not going to read all the module makefiles,
so the checks gated behind FULL_BUILD will fail.

Test: lunch mainline_system_arm64; m vnod
Change-Id: Ic7842f772edd6b6a6fdc427d018ea1dfe3cbfdbf
2018-08-22 10:49:03 +01:00
Tao Bao
e9d61b02e8 Rename INSTALLED_SYSTEMIMAGE to INSTALLED_SYSTEMIMAGE_TARGET.
This gives a consistent mapping between partition names and the image
targets (i.e. partition => INSTALLED_PARTITIONIMAGE_TARGET). This CL
also creates an alias for the old name so that device-specific Makefiles
that refer to INSTALLED_SYSTEMIMAGE would keep working.

This CL renames image-for-partitions to images-for-partitions, and
returns INSTALLED_SYSTEMIMAGE_TARGET for system. It doesn't change the
actual functionality, but allows substantially simplifying the rule.

Test: `m dist` with aosp_taimen-userdebug
Test: `m dist` with a target that uses super partition
Change-Id: I2954ee5d855c1652a33c640ee615649588d5bc04
2018-08-21 21:57:21 -07:00
android-build-team Robot
b8ad2c0a9b Make change and version bump to PQ1A.180822.001
Change-Id: Ia954dc4b035f31871e11fc68611714b33331fcd2
2018-08-22 03:17:58 +00:00
Tao Bao
e94e9ead54 Merge "Install recovery etc files to recovery/root/system/etc."
am: c901630789

Change-Id: Iaa969ffce9fc42213ec641774170a1698e820777
2018-08-21 18:13:28 -07:00
Tao Bao
696bb33676 Install recovery etc files to recovery/root/system/etc.
They used to be installed under recovery/root/etc. This CL moves the
files to the new location and creates a symlink from /etc to /system/etc
(done by the rule in system/core/rootdir). This gives similar layout
between normal boot and recovery, and allows installing prebuilt_etc
files with Soong (`recovery_available: true`).

As part of the change, we no longer need the whitelisting rule for
mke2fs.conf.

Bug: 112780007
Test: Build with other changes in the topic (aosp_taimen-userdebug).
      Check the generated files under recovery (/etc being a symlink to
      /system/etc).
Test: Boot into recovery. Verify basic functionalities (`adb shell` and
      `adb sideload`, factory reset).
Test: `build/soong/build_test.bash --dist`
Change-Id: Ibb6dea6f179a339f0c2d0fd8ba05ec0085b79a12
2018-08-21 10:30:49 -07:00
Colin Cross
e50ba8fc87 Merge "Fix reference to cleared global variable"
am: 5d1688bf27

Change-Id: Id1b4a96c99adb7be2ac27c867fe30d924a3663f6
2018-08-20 20:35:40 -07:00
android-build-team Robot
6b2be45592 Make change and version bump to PQ1A.180821.001
Change-Id: I615c99cc23fe0727cbe070d4b7848dc80bd35962
2018-08-21 03:15:57 +00:00
Colin Cross
5d1688bf27 Merge "Fix reference to cleared global variable" 2018-08-21 02:50:50 +00:00
Colin Cross
cceb7ab6d7 Fix reference to cleared global variable
Use PRIVATE_general_tests_list_zip inside the rule.  Also remove the
output files to make it more likely that an incremental build fails
the same was as a clean build.

Bug: 112865316
Test: rm $OUT/general-tests* && m general-tests
Change-Id: Idbca35f9ca71f65ef45ef026df41bd933fb9d37d
2018-08-20 19:26:33 -07:00
Yifan Hong
048aa72eec Merge changes from topic "product-service-remove-hyphen"
am: d35fdd8b3d

Change-Id: I889c3a2aee262edadf10a85cae9ce89393be3cbc
2018-08-20 19:08:52 -07:00
Yifan Hong
2a8cd6776e Reland "s/PRODUCT-SERVICES/PRODUCT_SERVICES/g"
am: 35be6ca8f2

Change-Id: I533022aabe3d9e03a38cd7e6069f637369af50d2
2018-08-20 19:07:50 -07:00
Yifan Hong
d35fdd8b3d Merge changes from topic "product-service-remove-hyphen"
* changes:
  s/product-services/product_services/g
  Reland "s/PRODUCT-SERVICES/PRODUCT_SERVICES/g"
  Update CleanSpec to remove generated files from IVold.aidl.
2018-08-21 01:07:56 +00:00
Evgenii Stepanov
9afe363ceb Merge "Add "hwaddress" sanitizer."
am: 36ea50d760

Change-Id: I950d85d9d799a1fc1ae490d5f233e50112833a93
2018-08-20 17:10:50 -07:00
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
android-build-team Robot
faee5419b1 Make change and version bump to PQ1A.180820.001
Change-Id: I25d237f221b5980de4806202f60f1574bdaa9109
2018-08-20 03:15:10 +00: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
android-build-team Robot
5838ce3474 Make change and version bump to PQ1A.180817.001
Change-Id: I600aa2f1a43ea4c8a25c6e89df56d010fa043ee6
2018-08-17 03:15:09 +00: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