Commit graph

46118 commits

Author SHA1 Message Date
Patrik Fimml
df248e60e5 Don't override zsh users' compinit options.
I call "compinit -i" in my .zshrc, to allow loading autocompletion from
"unsafe" locations. envsetup.sh breaks that. Change behavior to only
call compinit if bash-style completion is not already enabled.

This is a minimal fix; an alternative would be to rely on the user
to call 'bashcompinit' in their .zshrc instead, and just skip all
autocomplete functionality if they don't.

Test: manual - source ./envsetup.sh in {bash, zsh, zsh -f} and test
	completion for lunch
Change-Id: Ibb10eb68a96d69c19b9db9b21e0546fe8ae299b2
2018-10-16 13:36:23 +02:00
Anton Hansson
0e91bac015 Merge "Allow more relaxed artifact path req enforcement" 2018-10-16 06:38:32 +00:00
Treehugger Robot
909c332fab Merge "releasetools: Clean up the logging while calling external commands." 2018-10-16 03:45:47 +00:00
Haibo Huang
4e90c3f9a5 Merge "Add A76 to known v8-a cores" 2018-10-15 21:01:30 +00: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
Tao Bao
bec89c1e1e releasetools: Clean up the logging while calling external commands.
common.RunAndCheckOutput() checks the exit code and will raise on errors.

Test: python -m unittest test_ota_from_target_files
Test: Call ota_from_target_files.py with aosp_marlin target_files zip
Test: Inject an error to the command. Repeat the call without verbose
      flag. It dumps the stack trace on error.
Change-Id: I85b765a33b9087bcbcb0571d6e632a07bb86c65c
2018-10-15 12:01:42 -07:00
Anton Hansson
d1874ddf86 Merge "Revert "Add trailing slash to mainline path claims."" 2018-10-15 10:17:38 +00:00
Anton Hansson
46bf4b510c Revert "Add trailing slash to mainline path claims."
This reverts commit f1fb31a301.

Reason for revert: breaks some builds

Change-Id: I22f7939dc25bee6e3c2b8835f86ce5772ab3edec
2018-10-15 10:13:35 +00:00
Anton Hansson
9d5b3dbf17 Merge "Add trailing slash to mainline path claims." 2018-10-15 08:34:02 +00:00
Tao Bao
1e5a23f9b0 Merge "releasetools: Fix a broken test due to verity utils relocation." 2018-10-14 14:58:57 +00:00
Tao Bao
28f201b417 releasetools: Fix a broken test due to verity utils relocation.
Test: python -m unittest test_validate_target_files
Change-Id: I2267e18f63d4a36ecd5fff911848470a860ab6cf
2018-10-13 19:27:52 -07:00
Tao Bao
d685239e37 Merge "releasetools: Move verity related functions into verity_utils.py." 2018-10-13 15:34:06 +00: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
Treehugger Robot
fd96f57263 Merge "Check dir existence before finding files for OTATOOLS_DEPS." 2018-10-12 21:56:37 +00:00
Tao Bao
71197515bb releasetools: Move verity related functions into verity_utils.py.
This prepares for upcoming changes that refactor verity-related
functions into classes.

This CL makes minimal changes to the moved functions, by creating a new
BuildVerityImageError class in verity_utils.py replacing the former
BuildImageError that's specific to build_image.py. As part of the
change, it also moves the tests for AVBCalcMinPartitionSize into
test_verity_utils.py.

Test: python -m unittest test_verity_utils
Test: `m dist` with aosp_marlin-userdebug (Verified Boot 1.0)
Test: `m dist` with aosp_taimen-userdebug (Verified Boot 2.0)
Change-Id: I19b52714d8980705ea1f9484ac03eb0af9483240
2018-10-12 12:09:34 -07:00
Tao Bao
e95680a60f Merge "releasetools: Add a common base class for unittests." 2018-10-12 18:33:56 +00: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
d772deb653 Merge "Scudo minimal runtime support for make" 2018-10-12 16:49:31 +00:00
Treehugger Robot
07d87198ee Merge "Allow GSI targets to build otatools.zip" 2018-10-12 14:35:43 +00:00
Anton Hansson
f1fb31a301 Add trailing slash to mainline path claims.
Fixes a bug where system_other/ paths are considered part of
the "system" path.

Test: lunch mainline_arm64; m nothing
Change-Id: Id7aad41ea285f545260289f59e55c251677bdc38
2018-10-12 11:10:17 +01: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
Tao Bao
65b94e92be releasetools: Add a common base class for unittests.
All the releasetools unittests extend the common base class of
test_utils.ReleaseToolsTestCase. Define tearDown() in the base class to
do the clean-up works.

Test: `pylint --rcfile=pylintrc test_*.py`
Test: `python -m unittest discover .`
Change-Id: I51775d964ef032dcdf3bb89c55e1a31371cde708
2018-10-11 23:01:09 -07:00
Treehugger Robot
f77560ec12 Merge "releasetools: Rename test names in test_verity_utils.py." 2018-10-12 05:58:24 +00: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
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
b2dd1b6365 Merge "releasetools: Move build_image.RunCommand into common.py." 2018-10-11 20:53:41 +00:00
Tom Cherry
37660e2e32 Merge "Whitelist TARGET_COPY_OUT_RAMDISK for mainline" 2018-10-11 17:57:20 +00: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
933a12f394 Merge "Support LOCAL_ADDITIONAL_DEPENDENCIES to soong_cc_prebuilt.mk" 2018-10-11 08:50:47 +00: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
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
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
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
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
10b28befbe Merge "Change install paths of libs in sanitize builds" 2018-10-09 18:14:20 +00:00