Commit Graph

17671 Commits

Author SHA1 Message Date
Yifan Hong
422790ca3d Remove PRODUCT_USE_FASTBOOTD flag.
It is not used.
Test: builds

Change-Id: Iff5fbae524945cebd9c8911762e7fc7fb8ac19aa
2018-10-16 13:34:18 -07:00
Mathew Inwood
8c96298a92 Write greylist annotation metadata to a csv file.
Also add support for merging these into a single file elsewhere in the
build.

Test: m, inspect generated greylist.csv
Bug: 117314178
Change-Id: If28110fc1ed090222e55c274e8363110753d10f1
2018-10-16 12:06:02 +01:00
Anton Hansson
22db4db050 Merge "Allow more relaxed artifact path req enforcement"
am: 0e91bac015

Change-Id: I66d996ba72a234623dea55c7ad0bf501d4b96037
2018-10-15 23:46:12 -07:00
Anton Hansson
83ba31cd95 Allow a hint together with artifact path enforcement
This enables specifying a product-specific error message, to
accompany the otherwise potentially cryptic message.

Bug: 117637311
Bug: 80410283
Test: downstream product
Test: lunch mainline_arm64; m nothing
Change-Id: I9953d44d6338e5a79c5ed651716d3e39647ec87a
2018-10-16 07:41:02 +01:00
Anton Hansson
0e91bac015 Merge "Allow more relaxed artifact path req enforcement" 2018-10-16 06:38:32 +00:00
yangbill
fab820c5f1 ATest: GTest auto gen config support run-test-as.
Feature request from developer, support setting uid in makefile.

Bug: 113359343
Test: apply aosp/757329
      make -j hello_world_test_mk (w/ UID setting in config)
      make -j hello_world_test_mk2 (w/o UID setting in config)
      check test config of host's hello_world_test_mk (w/o UID setting in config)

Change-Id: I167c737098fa906e401769c6a8838f46b03bd33c
2018-10-16 08:27:36 +08:00
David Anderson
7709ab2b69 Rename vbmeta_mainline to vbmeta_system.
Bug: 116859651
Test: device builds with chained vbmeta_system enabled
      vbmeta_system.img is generated

Change-Id: I75b52a89feeec8dd0e1e271d2a8c3c94036c932c
2018-10-15 14:42:29 -07:00
Haibo Huang
55bae8010b Merge "Add A76 to known v8-a cores"
am: 4e90c3f9a5

Change-Id: Ie1057b7b2794856621332e016a40634fa239504b
2018-10-15 14:15:42 -07:00
Anton Hansson
9cdf17241a Allow more relaxed artifact path req enforcement
Only enforce whitelist entries are unused if the enforcement variable
is set to "true" or "strict". If set to something else (e.g. "relaxed"),
allow redundant whitelist entries.

This also enables adding wildcard entries, which were previously
considered unused.

Test: downstream
Bug: 117637311
Bug: 80410283
Change-Id: I67a84f8ecfad5fa68c21ee728f1e3085ef89fbcf
2018-10-15 20:49:48 +01:00
Haibo Huang
e211f7cd2d Add A76 to known v8-a cores
Bug: 117125298
Test: build
Change-Id: Ice05e7d4996252cfe4a9881a628c11b0f12cfd1b
2018-10-12 23:54:51 +00:00
Tao Bao
f81b80f89f Merge "Check dir existence before finding files for OTATOOLS_DEPS."
am: fd96f57263

Change-Id: I1ec0ab995281ace1cdf222a9b70071b82b334dee
2018-10-12 15:14:56 -07:00
Tao Bao
93ab84467f Check dir existence before finding files for OTATOOLS_DEPS.
This avoids building errors in branches that don't include such projects
(e.g. external/avb or system/update_engine). Note that although it
won't actually build otatools in such branches, it fails while parsing
the Makefile.

Bug: 112293933
Test: Rename external/avb. `m otatools` passes.
Change-Id: I334239fb23b1795ec77049ba9b81b288d2b4e2da
2018-10-12 11:28:17 -07:00
Kostya Kortchinsky
31c22382f0 Merge "Scudo minimal runtime support for make"
am: d772deb653

Change-Id: I962901f30e815238dd0cc805cc61d8fbc602fe00
2018-10-12 10:04:00 -07:00
Kostya Kortchinsky
d772deb653 Merge "Scudo minimal runtime support for make" 2018-10-12 16:49:31 +00:00
Bowgo Tsai
ad0114acb1 Merge "Allow GSI targets to build otatools.zip"
am: 07d87198ee

Change-Id: Ie2732eccba803709d7f34ccaf1fd287f90d2cc8a
2018-10-12 07:45:49 -07:00
Treehugger Robot
07d87198ee Merge "Allow GSI targets to build otatools.zip" 2018-10-12 14:35:43 +00:00
Anton Hansson
f37a35cdd0 Re-add product_MODULES
This variable is depended on by vendor_module_check.mk

Bug: 117638909
Test: build_test
Change-Id: I93f7056b001ca803c88e1e1dfebe204f289c59ab
2018-10-12 11:34:29 +01:00
Vladimir Marko
9f4847e753 Merge "Prebuild: Remove --multi-image."
am: f696914fb5

Change-Id: If1b7edd3b7190856065445fad86164bdcd951b99
2018-10-12 02:22:11 -07:00
Vladimir Marko
f696914fb5 Merge "Prebuild: Remove --multi-image." 2018-10-12 09:00:56 +00:00
Bowgo Tsai
d6ff89705c Allow GSI targets to build otatools.zip
otatools.zip is required to sign GSI.

Bug: 112293933
Test: lunch aosp_arm64-userdebug && make otatools-package
Test: lunch aosp_arm64-userdebug && make otapackage will fail
Change-Id: Iae9f9af5cc8b98c05a66219779ce35592d3321bd
2018-10-12 14:41:46 +08:00
Kostya Kortchinsky
47c10eb2fc Scudo minimal runtime support for make
Scudo is now compatible with the -fsanitize-minimal-runtime, and offers a new
dynamic library that doesn't bundle UBSan.

This patch adds support for this new library in make, preferring it over the
full one, unless a diagnostic dependency is found.

Test: aosp compiled with m -j
Test: local test enabling Scudo for mediaextractor
Change-Id: I99ac0d410b1619de09783f5009476c1ea2995f98
2018-10-11 15:06:11 -07:00
Pirama Arumuga Nainar
dfec4ef4fc Merge "Change STL for Windows to libc++."
am: 5155d9a8dd

Change-Id: Ia64df0c4d320424c31a0b63e72c9a365eb0a27b3
2018-10-11 10:21:28 -07:00
Pirama Arumuga Nainar
5155d9a8dd Merge "Change STL for Windows to libc++." 2018-10-11 17:00:53 +00:00
Vladimir Marko
0aea49c0ce Prebuild: Remove --multi-image.
The option is ignored since
    https://android-review.googlesource.com/784718 .

Test: m test-art-host-gtest
Test: testrunner.py --host --optimizing
Test: Pixel 2 XL boots.
Test: testrunner.py --target --optimizing
Bug: 77856493
Change-Id: I32c323c0cabbd87cd1993c4355a354bc65529bc0
2018-10-11 17:14:45 +01:00
Logan Chien
e9ce7ced47 Merge "Support LOCAL_ADDITIONAL_DEPENDENCIES to soong_cc_prebuilt.mk"
am: 933a12f394

Change-Id: I90fe1e243a5d8caa7e1845940b3fcc5cd3b6e5ab
2018-10-11 02:08:31 -07:00
Logan Chien
933a12f394 Merge "Support LOCAL_ADDITIONAL_DEPENDENCIES to soong_cc_prebuilt.mk" 2018-10-11 08:50:47 +00:00
Andreas Gampe
c1d5f24bb0 Merge "Build: Do not build sanitize-never executable"
am: 38972496b0

Change-Id: I87b77465bffd7586ece11bc2734b25033a67c43f
2018-10-10 23:33:01 -07:00
Logan Chien
c24a265ae9 Support LOCAL_ADDITIONAL_DEPENDENCIES to soong_cc_prebuilt.mk
This commit adds LOCAL_ADDITIONAL_DEPENDENCIES to soong_cc_prebuilt.mk
so that ABI dump and diff files can be generated and checked.

Test: make -j && find out -name '*.abidiff'
Change-Id: If12ec9a321f42efe4f8dc938568e8911400cc053
2018-10-11 11:19:31 +08:00
Andreas Gampe
2114c5ab3f Build: Do not build sanitize-never executable
When LOCAL_SANITIZE := never is given for an executable, skip
building the binary in the ASAN build stage.

Bug: 117579123
Test: Build ASAN image with a never-sanitized executable
Change-Id: I6495fc857678ca9b46527c7d60ee71112004266d
2018-10-10 19:27:04 -07:00
Colin Cross
ef92a76397 Merge changes I6a4060a7,I7743fbda,I88eb24f8
am: ff999725ac

Change-Id: I32764651cc7669f4df1e8b26843d466f51c4cff6
2018-10-10 16:26:54 -07:00
Colin Cross
ff999725ac Merge changes I6a4060a7,I7743fbda,I88eb24f8
* changes:
  Unnest independent dexpreopt conditionals
  Indent dex_preopt_odex_install.mk
  Revert "Build: Do not treat org.apache.http.legacy.boot as boot classpath"
2018-10-10 22:35:49 +00:00
Po Hu
f513705f8f Merge "Initialize variable to fix wrong odex installed"
am: 471656df53

Change-Id: I6e1354f790d2f05dc6727195f1721d3927b09063
2018-10-10 13:30:11 -07:00
Treehugger Robot
471656df53 Merge "Initialize variable to fix wrong odex installed" 2018-10-10 20:06:32 +00:00
Colin Cross
c18757e34d Unnest independent dexpreopt conditionals
Most of the 6 nested conditionals are independent and can be
evaluated individually.  This has a slight change in behavior,
disabling preopt for a module in the product will now override
LOCAL_DEX_PREOPT, but that seems preferable.

Test: m
Change-Id: I6a4060a78df729c34bbf6978c84993859a947bf7
2018-10-10 10:12:03 -07:00
Vladimir Marko
de1467e7f3 Merge "Prebuild: Remove --compile-pic and -Xnorelocate."
am: c79539baca

Change-Id: I4ad7ef6562690294418eb4ecb4e2c2b2420a3087
2018-10-10 02:49:09 -07:00
Treehugger Robot
c79539baca Merge "Prebuild: Remove --compile-pic and -Xnorelocate." 2018-10-10 09:39:24 +00:00
Po Hu
eaef4d8b9f Initialize variable to fix wrong odex installed
When "PRODUCT_DEX_PREOPT_GENERATE_DM_FILES := true" and
"PRODUCT_DEX_PREOPT_DEFAULT_COMPILER_FILTER := verify" are set,
boot jar may wrongly refer to previous module's variables such as
my_generate_dm, my_built_dm and my_installed_dm. And then cause
unexpected files installed along with this boot jar.

So initialize my_generate_dm to empty at first.

Bug: 117526952
Test: make out/target/product/generic/module-info.json
Test: cat out/target/product/generic/module-info.json | grep '"apache-xml":'
Change-Id: Iaa851f4fb530b3446de3dbcb1f54e545938830ce
2018-10-10 13:40:15 +08:00
Colin Cross
0a69bb6c90 Indent dex_preopt_odex_install.mk
Test: m checkbuild
Change-Id: I7743fbda98d1f1ea1d3e8242905239ff0115b6a9
2018-10-09 21:20:21 -07:00
Paul Duffin
cb846fa6f8 Revert "Build: Do not treat org.apache.http.legacy.boot as boot classpath"
This reverts commit 039bb48f72.

This is no longer needed. Depending on the setting of REMOVE_OAHL_FROM_BCP the org.apache.http.legacy library is now either on the bootclasspath or a standalone library, it cannot be both.

Bug: 18027885
Bug: 72167111
Change-Id: I88eb24f8a4324e206fd384cd8adf79acd6fc0858
Merged-In: I88eb24f8a4324e206fd384cd8adf79acd6fc0858
Test: make with and without REMOVE_OAHL_FROM_BCP=true
(cherry picked from commit 9390268746)
2018-10-09 21:19:25 -07:00
Colin Cross
4e04fff35e Merge "Remove extra JNI libs from prebuilt APKs"
am: 0443b46066

Change-Id: I5e0a657afcc61f7d7a7d19c2321b0654901274ca
2018-10-09 16:19:31 -07:00
Colin Cross
9cda85eb94 Merge "Add support for JNI libraries to soong_app_prebuilt.mk"
am: 9cb5cfad6d

Change-Id: I6ddadaf1b6e2445d9cf64316e9f2fa9cecf4a6e5
2018-10-09 15:52:12 -07:00
Treehugger Robot
0443b46066 Merge "Remove extra JNI libs from prebuilt APKs" 2018-10-09 22:35:26 +00:00
Treehugger Robot
9cb5cfad6d Merge "Add support for JNI libraries to soong_app_prebuilt.mk" 2018-10-09 21:50:40 +00:00
Colin Cross
0e8a2ee172 Remove extra JNI libs from prebuilt APKs
If an APK specifies LOCAL_PREBUILT_JNI_LIBS embedded in the prebuilt
APK, remove any that aren't listed.  Restores the behavior from before
I82dd3aa441712772a1d1ddd6aaf5f41179facaa7.

Bug: 69500920
Test: m checkbuild
Change-Id: I971a9c4206604c172d77144df4c0ed9a8b1c5dd0
2018-10-09 13:06:01 -07:00
Andreas Gampe
aa7650648f Merge "Change install paths of libs in sanitize builds"
am: 10b28befbe

Change-Id: I24ee93f44f9932d90e85d95bdedbdf1ecfddae29
2018-10-09 11:25:11 -07:00
Andreas Gampe
10b28befbe Merge "Change install paths of libs in sanitize builds" 2018-10-09 18:14:20 +00:00
Vladimir Marko
a332207767 Prebuild: Remove --compile-pic and -Xnorelocate.
The --compile-pic argument is obsolete, all generated code
is now PIC.

The -Xnorelocate is ignored by dex2oat since
    https://android-review.googlesource.com/771001
where the option was reinterpreted from "use patchoat if
needed" to "relocate the boot image in memory if possible"
and dex2oat forbids that relocation.

Test: Pixel 2 XL boots.
Bug: 77856493
Change-Id: I60cdf81267a129be8a482af26fb865110561268e
2018-10-09 17:35:07 +01:00
nelsonli
f52da96e11 Merge "Build System: Ignore copies in copy-many-files if src == dst"
am: 5112afe657

Change-Id: I48764170916be8ff5be985c16457ba3f09ce40d2
2018-10-09 03:34:12 -07:00
nelsonli
c91284dcd8 Build System: Ignore copies in copy-many-files if src == dst
BUG: 117224272

Test: 1. Modify build/core/base_rules.mk
         Add the following line after line 617
	  $(eval my_compat_dist_$(suite) += out/a:out/a))
      2. touch out/a
      3. make -j BluetoothInstrumentationTests
      4. It should build pass without any dependency errors.

Change-Id: I40372eab5b74e042f605c3cb38e72942531ed69a
2018-10-09 14:46:40 +08:00
Colin Cross
ce594b4549 Merge "Use zip2zip for uncompress-dexs and uncompress-shared-libs"
am: 0ab356ac20

Change-Id: Ia399045bb814afb3cea77af4d029f461b945aef7
2018-10-08 17:38:27 -07:00