Commit Graph

46159 Commits

Author SHA1 Message Date
Treehugger Robot
d68c98538d Merge "Build: update warn.py for Errorprone 2.3.2" 2018-10-18 18:45:16 +00:00
Tao Bao
185ce5ffb3 Merge "releasetools: Switch to Python logging." 2018-10-18 17:31:29 +00:00
Matt Wachowski
ac02d67652 Merge "Supporting change for aosp/771168" 2018-10-18 16:20:12 +00:00
Anton Hansson
058f33ec0f Merge "Remove PRODUCT_SHIPPING_API_LEVEL in mainline_system" 2018-10-18 15:32:47 +00:00
Anton Hansson
b65a5ba193 Remove PRODUCT_SHIPPING_API_LEVEL in mainline_system
Let this be defined in the leaves instead. As is it frequently causes
problems where the product inheriting this also inherit another value
of PRODUCT_SHIPPING_API_LEVEL, leading to invalid values unless
overridden again.

Bug: 80410283
Test: lunch mainline_arm64; m nothing
Test: lunch mainline_system_arm64; m nothing
Change-Id: Id08b6cc0cd8815404e548c521c9e40706ba8ca16
2018-10-18 13:40:22 +01:00
Anton Hansson
fc1e1a54cd Merge "Add PresencePolling to mainline_system" 2018-10-18 08:04:19 +00:00
Anton Hansson
471a45b952 Merge "Re-submit "Add trailing slash to mainline path claims."" 2018-10-18 08:03:53 +00:00
Treehugger Robot
569ddd300b Merge "fix generic_x86_arm" 2018-10-18 06:59:39 +00:00
Matt Wachowski
40afa81053 Supporting change for aosp/771168
Submitting the change above before this one will "work" for now but we
want to pass vbmeta.img instead of system.img for the more robust
solution.

Bug: 78113934
Test: Built on my local machine.  Asserted that VerifiedBootParams.proto
exists.  Asserted that the emulator boots correctly with this file.

Change-Id: Ie91f49a3c7d49fc667e3f12e7e3866c3d9eb1960
2018-10-17 16:38:53 -07:00
Treehugger Robot
6393560856 Merge "Remove check_emu_boot, it's no longer necessary" 2018-10-17 23:22:47 +00:00
bohu
9b4e805a4d fix generic_x86_arm
To make the generic_x86_arm bootable.
Third party translabor binary can be added on the resulting
system.img and be tested at least on emulator.

BUG: 117673798

Change-Id: Iffbcf9217bbedc12ba83a4851e84ecbf299bf8e7
Merged-In: Iffbcf9217bbedc12ba83a4851e84ecbf299bf8e7
2018-10-17 21:57:15 +00:00
Dan Willemsen
b1e3357962 Remove check_emu_boot, it's no longer necessary
Bug: 117859878
Test: treehugger
Change-Id: I4e9ade9b5b9dc7d494101bbd0b0eb2b245244337
2018-10-17 11:13:07 -07:00
Anton Hansson
da02e8619a Add PresencePolling to mainline_system
Missed adding this app in I5afabc7dcc4ca320f06fdc4a2669fb1b81e53b0b.
It is usually added in conjunction with RcsService.

Bug: 80410283
Test: lunch mainline_arm64; m nothing
Change-Id: Ic721d1dcef479a03f4b603bd77a91801ea9dd9ec
2018-10-17 18:04:46 +01:00
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
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
Treehugger Robot
6587e4566f Merge "android.test.{base|mock} are added as optional libraries." 2018-10-17 04:29:07 +00: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
Treehugger Robot
d5eb793c40 Merge "Remove PRODUCT_USE_FASTBOOTD flag." 2018-10-16 23:43:09 +00: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
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
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
Treehugger Robot
909c332fab Merge "releasetools: Clean up the logging while calling external commands." 2018-10-16 03:45:47 +00: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
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
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