Commit Graph

46791 Commits

Author SHA1 Message Date
Treehugger Robot
f77560ec12 Merge "releasetools: Rename test names in test_verity_utils.py." 2018-10-12 05:58:24 +00:00
Sooraj Sasindran
837eeb1f8e Merge "Add ANS to telephony systems"
am: 0c833a7fba

Change-Id: I960d762d49dc04d26d013511fba5747a0fd5761d
2018-10-11 21:55:17 -07:00
Treehugger Robot
0c833a7fba Merge "Add ANS to telephony systems" 2018-10-12 04:41:09 +00: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
Steven Moreland
3aefd6a480 Merge "VNDK-core += android.hidl.safe_union@1.0.so"
am: bb0d85169f

Change-Id: I42f0cea6881173c68be44c50f0bc2c5ae5bb64ba
2018-10-11 14:44:12 -07:00
Tao Bao
5fe287beb4 releasetools: Rename test names in test_verity_utils.py.
There's a naming convention between the testcase and the class/method
being tested.

Also remove VerifiedBootVersion2HashtreeInfoGenerator as it's merely a
placeholder without telling anything much (e.g. whether it's to be
implemented or working as intended).

Test: python -m unittest test_verity_utils
Change-Id: Ieb156765c865aa551e3882f381e3a6db2cac4cbc
2018-10-11 14:39:09 -07:00
Steven Moreland
bb0d85169f Merge "VNDK-core += android.hidl.safe_union@1.0.so" 2018-10-11 21:23:27 +00:00
Tao Bao
6c22649500 Merge "releasetools: Move build_image.RunCommand into common.py."
am: b2dd1b6365

Change-Id: I52f67f635c16b1212e5023044bbdca45f2b7a0ff
2018-10-11 14:14:49 -07:00
Tao Bao
b2dd1b6365 Merge "releasetools: Move build_image.RunCommand into common.py." 2018-10-11 20:53:41 +00:00
Tom Cherry
4ac9c871b0 Merge "Whitelist TARGET_COPY_OUT_RAMDISK for mainline"
am: 37660e2e32

Change-Id: I4b6bace334b13f8b20a94f37e0154c1b6b14d858
2018-10-11 11:14:22 -07:00
Tom Cherry
37660e2e32 Merge "Whitelist TARGET_COPY_OUT_RAMDISK for mainline" 2018-10-11 17:57:20 +00: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
Steven Moreland
637b675b89 VNDK-core += android.hidl.safe_union@1.0.so
Bug: 116156870
Test: build & boot
Change-Id: I6712d035d5a30ed3e06acf9503e00231053ce6ce
2018-10-11 09:53:45 -07: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
Treehugger Robot
38972496b0 Merge "Build: Do not build sanitize-never executable" 2018-10-11 06:10:32 +00: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
Tao Bao
986ee86854 releasetools: Move build_image.RunCommand into common.py.
build_image.RunCommand and common.Run are essentially doing the same
work, but with different interfaces and return values. This CL
consolidates them by moving build_image.RunCommand into common.py as
common.RunAndCheckOutput, with the former calling common.Run internally.

common.RunAndCheckOutput checks the exit code: it returns the output
string on success, or raises common.ExternalError otherwise.

Test: `m dist` with aosp_marlin-userdebug
Test: python -m unittest test_build_image
Test: python -m unittest test_common
Change-Id: I3cd0e9301c576572194618eba8dc00db06c3c35f
2018-10-10 18:13:24 -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
Sooraj Sasindran
0d4a3c2e46 Add ANS to telephony systems
Add ANS to telephony systems

Bug: 114793357
Test: verified it using developer options
Change-Id: Id31be8524934b47345ba95954636822eb59264ac
Merged-In: Id31be8524934b47345ba95954636822eb59264ac
2018-10-10 20:40:52 +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
Tom Cherry
16f45d6cd9 Whitelist TARGET_COPY_OUT_RAMDISK for mainline
Test: mainline builds without BOARD_BUILD_SYSTEM_ROOT_IMAGE set.
Change-Id: Ia3a5bfa6d2ba1872710409d8c88bba6ff710a1c6
2018-10-09 10:41:01 -07: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
Treehugger Robot
5112afe657 Merge "Build System: Ignore copies in copy-many-files if src == dst" 2018-10-09 10:25:22 +00:00
Kevin Cheng
9db85cd422 Merge "Add acloud shortcut in envsetup.sh"
am: e58de93cdb

Change-Id: Ie1c9b450263a7a02cd5f27cd0868fc3abae27da9
2018-10-09 01:19:08 -07:00
Treehugger Robot
e58de93cdb Merge "Add acloud shortcut in envsetup.sh" 2018-10-09 08:09:44 +00: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
Elliott Hughes
54045b181c Merge "Move zipalign off NO_ERROR."
am: 3f7223984c

Change-Id: I37e953bd989d5f04b42129eef876c1aff4d162fb
2018-10-08 19:14:58 -07:00
Treehugger Robot
3f7223984c Merge "Move zipalign off NO_ERROR." 2018-10-09 02:00:27 +00: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