Commit Graph

47347 Commits

Author SHA1 Message Date
Treehugger Robot
fac7b1de9c Merge "Fix typo" 2018-10-17 16:17:21 +00:00
Anton Hansson
dcb5ef1333 Re-submit "Add trailing slash to mainline path claims."
With a workaround for preopt files that get installed into an unknown
path. The BoardConfig defines whether the files go in /system_other,
so allow that.

This reverts commit 46bf4b510c.

Test: lunch mainline_arm64-userdebug; m nothing
Change-Id: Ia75670eb6e3730ad0ff17f5b81954b69f6cab22b
2018-10-17 16:40:29 +01:00
Treehugger Robot
d3e8e5321f Merge "Clean up DIST_DIR usages, move to dist-for-goals" 2018-10-17 15:26:38 +00:00
Tao Bao
32fcdab512 releasetools: Switch to Python logging.
Converts the following files to Python logging.

add_img_to_target_files.py
blockimgdiff.py
build_image.py
check_ota_package_signature.py
common.py
img_from_target_files.py
make_recovery_patch.py
ota_from_target_files.py
sparse_img.py
verity_utils.py

This separates logging outputs from normal outputs, and allows easier
switching between different verbosity levels. It also supports adjusting
logging config via environment variable (LOGGING_CONFIG).

Test: `m dist`
Test: `python -m unittest discover build/make/tools/releasetools`
Change-Id: Idfc3f7aff83e03f41f3c9b5067d64fd595d5192d
2018-10-17 07:51:04 -07:00
Patrik Fimml
bcd3d85971 Merge "Don't override zsh users' compinit options." 2018-10-17 10:53:33 +00:00
Mathew Inwood
c948d1a101 Merge "Write greylist annotation metadata to a csv file." 2018-10-17 09:20:04 +00:00
Anton Hansson
28e0f0353c Fix typo
We want to add to PRODUCT_PACKAGES_DEBUG, not overwrite it.

Test: make
Change-Id: Ib67d20e33b30edd76ca24ce208f899cb4c25004c
2018-10-17 09:08:27 +01:00
Anton Hansson
e885f35d05 Merge "Add some debug binaries to mainline_system"
am: 7f758720f6

Change-Id: I251cae723eb7efec8823f1501a3d2e2bd075b94a
2018-10-17 00:40:19 -07:00
Anton Hansson
daae95e8ff Merge "Allow a hint together with artifact path enforcement"
am: 4fa4ba11ef

Change-Id: I7effaeb2a9b70e9c79f465a68ab7d7a6aa1757ce
2018-10-17 00:39:41 -07:00
Anton Hansson
8bafde098f Merge "Add the default charger images to mainline_system"
am: bb449e0bd4

Change-Id: I404000cdf8ecc31a9239bc9ebf0df6763382584f
2018-10-17 00:38:59 -07:00
Anton Hansson
7f758720f6 Merge "Add some debug binaries to mainline_system" 2018-10-17 07:23:18 +00:00
Anton Hansson
4fa4ba11ef Merge "Allow a hint together with artifact path enforcement" 2018-10-17 07:22:55 +00:00
Anton Hansson
bb449e0bd4 Merge "Add the default charger images to mainline_system" 2018-10-17 07:20:54 +00:00
Dan Willemsen
7537fd050f Clean up DIST_DIR usages, move to dist-for-goals
soong_ui now guarantees DIST_DIR is set in the environment, so remove
the default.

Use dist-for-goals instead of writing directly into DIST_DIR.

When building the system image, use DIST_DIR from the environment
instead of from make. This will eventually stop working, but this will
work for now.

Bug: 117463001
Test: m dist  (check gpl_source.tgz, logs/product_copy_files_ignored.txt)
Test: m out/target/product/generic/product_copy_files_ignored.txt
Change-Id: Ice557e0a148602cb8eb154efb747d416f0d0db59
2018-10-16 23:37:51 -07:00
Jiyong Park
9018cbb5bf Merge "android.test.{base|mock} are added as optional libraries."
am: 6587e4566f

Change-Id: Ib274975e54426041d5c0d2ee76125e8d640f094d
2018-10-16 21:44:07 -07:00
Treehugger Robot
6587e4566f Merge "android.test.{base|mock} are added as optional libraries." 2018-10-17 04:29:07 +00:00
Yifan Hong
3c135d09ab Merge "Build group info to super image"
am: 206813151d

Change-Id: I09ca9a4a508c54455d2be1d97d52aceddce14204
2018-10-16 18:48:41 -07:00
Treehugger Robot
206813151d Merge "Build group info to super image" 2018-10-17 01:37:24 +00:00
Jiyong Park
4a602955d0 android.test.{base|mock} are added as optional libraries.
The two java shared libraries do not exist in the pre-P devices.
Therefore, marking the dependencies to the libraries as optional so that
an app is still installable to the old devices.

This is safe because the classes in the java shared libs exist in other
shared libraries (bootclasspath or android.test.runner).

Bug: 113800422
Test: run aapt dump badging on the built GtsBackupHostTestCases

uses-library tags for android.test.base|mock are with
android:required=false, while the same tag for other libs are without
the attribute.

Change-Id: Ieb7c1429077aaf6899e214a217d9455d95dbfea6
2018-10-17 10:21:33 +09:00
Yifan Hong
dcf4762364 Merge "Remove PRODUCT_USE_FASTBOOTD flag."
am: d5eb793c40

Change-Id: I59338496d3ddbefa2ed3df2056595bbc37572ce6
2018-10-16 16:48:29 -07:00
Treehugger Robot
d5eb793c40 Merge "Remove PRODUCT_USE_FASTBOOTD flag." 2018-10-16 23:43:09 +00:00
Chih-Hung Hsieh
6cae701e1e Merge "Fix implicit-fallthrough warning."
am: 160bbc42f8

Change-Id: I9eccfbdc8fc93501c18a07b3de81288a243f50db
2018-10-16 15:17:24 -07:00
David Anderson
11d4c35bfb Merge "Rename vbmeta_mainline to vbmeta_system."
am: 86fb70dcdc

Change-Id: Id0abc01c96841681ae8a302a011614f134d22a77
2018-10-16 15:16:06 -07:00
Treehugger Robot
160bbc42f8 Merge "Fix implicit-fallthrough warning." 2018-10-16 22:04:01 +00:00
Treehugger Robot
86fb70dcdc Merge "Rename vbmeta_mainline to vbmeta_system." 2018-10-16 22:02:48 +00:00
Yifan Hong
9edaa38bdf Build group info to super image
Bug: 116817738
Test: lpdump and manual inspect
Change-Id: I990300d1d5772ae5e9f28b916d91c5bea9cd9a50
2018-10-16 14:32:43 -07:00
Tom Cherry
aafccd7aac Merge "Separate init packaging for mainline"
am: eea8dad05f

Change-Id: I9ddf2c1357793e28e81cf06d31abaa58acf798f6
2018-10-16 13:38:36 -07:00
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
Tom Cherry
eea8dad05f Merge "Separate init packaging for mainline" 2018-10-16 20:29:47 +00:00
Chih-Hung Hsieh
1ce134aab7 Fix implicit-fallthrough warning.
Bug: 112564944
Test: make checkbuild
Change-Id: I7fcc52cd96cd781fe026e07c8029feeea8ceced0
2018-10-16 11:50:18 -07:00
Tom Cherry
6195b3578a Separate init packaging for mainline
With system-as-root, both first and second stage init belong to
system, but without system-as-root, first stage belongs to vendor and
second stage belongs to system.  This change references two phony
packages that include the right parts of init for systen and vendor.

Bug: 117606184
Test: mainline builds work properly
Change-Id: I997309655fef28cb1c3d4b3be989c035b5c6488d
2018-10-16 09:58:54 -07:00
Anton Hansson
aa236882c0 Add the default charger images to mainline_system
Bug: 80410283
Test: lunch mainline_arm64; m nothing
Change-Id: I539b57ef436be3d6209d6436fae6c5eb75832bf7
2018-10-16 17:34:33 +01:00
Anton Hansson
36c5d0d1cc Add some debug binaries to mainline_system
These binaries are commonly included in debug builds, so include
them on mainline too.

Bug: 80410283
Test: lunch mainline_arm64; m nothing
Change-Id: If0adfb4795ea82e158a0218d9c16d897012dd8b5
2018-10-16 16:15:39 +01:00
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
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
Tao Bao
4fdbd7ddd8 Merge "releasetools: Clean up the logging while calling external commands."
am: 909c332fab

Change-Id: I3a6892dd5d9664963a315631bf2299d265066dc5
2018-10-15 21:34:18 -07:00
Treehugger Robot
909c332fab Merge "releasetools: Clean up the logging while calling external commands." 2018-10-16 03:45:47 +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
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
Andreas Gampe
161ec1ecc1 Build: update warn.py for Errorprone 2.3.2
Bug: 114129741
Test: manual
Change-Id: I7fb34881a623ffb115a92bfffb108b503d4645ad
2018-10-15 08:56:58 -07:00
Florian Mayer
a910ba41c8 Build heapprofd per default.
See go/heapprofd for details. This will be used to profile the memory
usage of system services and apps.

See https://b.corp.google.com/issues/111289182#comment2 for system
health approval.

Change-Id: I2cf3af57e22c39c968afc0ca971f1d3862e27fe2
2018-10-15 14:14:55 +01:00
Anton Hansson
f9ae891d1c Merge "Revert "Add trailing slash to mainline path claims.""
am: d1874ddf86

Change-Id: I4b945a7432a91b8294395da65542f8c155c361bf
2018-10-15 03:29:21 -07:00
Anton Hansson
d1874ddf86 Merge "Revert "Add trailing slash to mainline path claims."" 2018-10-15 10:17:38 +00:00