Commit Graph

53972 Commits

Author SHA1 Message Date
Tao Bao b369c7226a releasetools: Ignore nonexistent APEX overrides.
This allows sharing the same signing config on different target_files
zips. Nonexistent APEX will be ignored with a warning.

Bug: 137249701
Test: Run sign_target_files_apks with APEX overrides.
Change-Id: I2bad0f5c00753ed36ec5ae3431c7dc2ff1fc3e9c
2019-07-11 11:54:39 -07:00
Xin Li 46552556a2 [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master"
am: 8eec867605 -s ours
am skip reason: subject contains skip directive

Change-Id: I89a612fc434ac30551dc831bc1882d75a245fc04
2019-07-11 11:50:13 -07:00
Tao Bao d8e2351ae4 Merge "releasetools: Replace iteritems with items." am: 6623fdda5a
am: 213210c4d0

Change-Id: I3bb134132776451b565ed899b3a57d609797587d
2019-07-11 11:49:34 -07:00
Tao Bao 213210c4d0 Merge "releasetools: Replace iteritems with items."
am: 6623fdda5a

Change-Id: I35c9e3b39897d20463aa12252a6118b427e64dfc
2019-07-11 11:39:41 -07:00
Treehugger Robot 8eec867605 Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master" 2019-07-11 18:33:34 +00:00
Tao Bao 6623fdda5a Merge "releasetools: Replace iteritems with items." 2019-07-11 18:07:19 +00:00
Paul Duffin c6a13166c6 Merge "Remove direct dependency on art/tools/veridex/appcompat.sh" am: 831197ee31
am: 533733d1e8

Change-Id: Iad91268ad1c1fcb545ed5607fcd13fae476f6c43
2019-07-11 08:15:43 -07:00
Paul Duffin 533733d1e8 Merge "Remove direct dependency on art/tools/veridex/appcompat.sh"
am: 831197ee31

Change-Id: I581234249a75c3fa2eca56976a271e122c834582
2019-07-11 08:08:56 -07:00
Paul Duffin 831197ee31 Merge "Remove direct dependency on art/tools/veridex/appcompat.sh" 2019-07-11 14:52:10 +00:00
Paul Duffin c319fdb65a Remove direct dependency on art/tools/veridex/appcompat.sh
The dependency causes a build breakage when unbundling the runtime
module, i.e. when the art repository is not present in the local build
tree.

Bug: 134379140
Test: m droid
Change-Id: Ia3f9b60dbe3e9cf00ea13ae7bdc74bdd386b4362
2019-07-11 12:24:54 +01:00
Regnier, Philippe 2f7e11ef27 logging: set stdout and stderr to None in some cases
For very long processes, we might want to keep stdout and stderr
by default to None.
So no redirection will occur in the child process as explained in:
https://docs.python.org/2/library/subprocess.html
That will result in the child process stdin and stderr to be same
than in common.py and avoid to have the logs blocked during the
child process execution and flushed only when child process terminates.
Since the logs are continously displayed, it allows to easily confirm
that the process is not blocked.

Bug: 133380588
Test: generate iota & Check that the logs are not blocked.

Change-Id: I6d6cb56547bf3a4a4334dfa22b6b2b05d2c36a5e
Signed-off-by: Regnier, Philippe <philippe.regnier@intel.com>
2019-07-11 17:05:17 +08:00
Tao Bao 3888428f29 releasetools: Replace iteritems with items.
While in theory this could incur memory overhead for Python 2, the
impact is low for the existing use cases (plus we're moving away from
Python 2).

Bug: 131631303
Test: No additional occurrence of iteritems.
Test: Build with Python 3.
Change-Id: I0205c9edf25f46e3d85967c7dd2c1af035757741
2019-07-10 22:29:20 -07:00
Tao Bao ef5b2234b1 Merge "Additionally run releasetools_test with Python 3." am: 576ae9628b
am: d2ff3b5dca

Change-Id: I90161cc19d8a97739630b2a8f0383d3a4bfcd5f8
2019-07-10 13:50:23 -07:00
Tao Bao d2ff3b5dca Merge "Additionally run releasetools_test with Python 3."
am: 576ae9628b

Change-Id: I090d9f67524c636967400d57164f26158562d3a9
2019-07-10 13:41:57 -07:00
Tao Bao 576ae9628b Merge "Additionally run releasetools_test with Python 3." 2019-07-10 18:22:37 +00:00
SzuWei Lin 2dff7463a0 Merge "Whitelist dexpreopt files for SdkSetup" am: 0bf9b427b6
am: bd7952bb38

Change-Id: I822f55f18a04a2769bc4fe17d97bce5ab1d7dc4f
2019-07-10 01:09:01 -07:00
SzuWei Lin bd7952bb38 Merge "Whitelist dexpreopt files for SdkSetup"
am: 0bf9b427b6

Change-Id: I49534b1a2353f0c78fd16cf1d2fde37477380c1f
2019-07-10 00:57:59 -07:00
Treehugger Robot 0bf9b427b6 Merge "Whitelist dexpreopt files for SdkSetup" 2019-07-10 07:28:37 +00:00
SzuWei Lin 58a545027f Merge "Revise GSI targets to inherit from mainline_system directly" am: 4899beb4bf
am: d5d128699c

Change-Id: I6fd08a46c05291f9465b120a6e2d95758deaf7b6
2019-07-09 21:28:19 -07:00
SzuWei Lin d2a6aa8525 Whitelist dexpreopt files for SdkSetup
aosp_product.mk removed the wildcard dexpreopt items. Any apk
requires to whitelist them also.

Bug: 135502030
Test: build aosp_arm-userdebug
Change-Id: Ibb1e6bfe6136a2e63f92e0305b3b939f08127428
2019-07-10 12:28:13 +08:00
SzuWei Lin d5d128699c Merge "Revise GSI targets to inherit from mainline_system directly"
am: 4899beb4bf

Change-Id: I3f418e667f2404f9d97ec39681ab222aee376838
2019-07-09 21:19:19 -07:00
Treehugger Robot 4899beb4bf Merge "Revise GSI targets to inherit from mainline_system directly" 2019-07-10 03:49:27 +00:00
Colin Cross f842aea501 [automerger skipped] temporarily disable vendor file check for mainline
am: 3f8eb7ec99 -s ours
am skip reason: change_id I99431a9a342e9b0617510e250597f3024ef39322 with SHA1 0bf940cace is in history

Change-Id: I0e8037c92f3bac0b597ad69d857b55bf5b968d11
2019-07-09 20:15:20 -07:00
Colin Cross 3f8eb7ec99 temporarily disable vendor file check for mainline
We want to use prebuilts for apex modules for qt-dev, but it is
running afoul of the vendor file check.  Disable the check for
now until we figure out a better solution.

Using Merged-In instead of DNM

Bug: 137033385
Test: Forrest run build_test
Change-Id: I9db5cb227780ede6aaff0070cd2fd59e95e635e6
Merged-In: 874b7a7766a569613dcd3ae526eaa6e1d4b78866
Merged-In: I99431a9a342e9b0617510e250597f3024ef39322
2019-07-09 15:36:28 -07:00
Daniel Norman bfdf765f97 Changes host_init_verifier to use hidl interface inheritance hierarchy.
Bug: 118016875
Test: Added 'interface' lines to an init_rc file and observed errors
when misspelled or missing entire inheritance hierarchy.
Change-Id: I71d515e0c12ed74800b9536f07da9fc7bb69597e
2019-07-09 20:18:49 +00:00
Sam Saccone dda6421246 Merge "Revert "this is the subject"" am: cd7eb25a33
am: 66a46e28a6

Change-Id: Ia98a3bb78b6cb4c3a94f2d3cb8d0904f82fd99f4
2019-07-09 12:23:22 -07:00
Sam Saccone 7c1576597d Merge "this is the subject" am: 73155879c5
am: 9af03f4cd1

Change-Id: I8823072b83ac8bddf569aee9ef05b716294cd24b
2019-07-09 12:21:49 -07:00
Sam Saccone 66a46e28a6 Merge "Revert "this is the subject""
am: cd7eb25a33

Change-Id: Ic0eb3bdc8fd3e9f98eb69133febf9dfa03125053
2019-07-09 12:12:19 -07:00
Sam Saccone 9af03f4cd1 Merge "this is the subject"
am: 73155879c5

Change-Id: I9dd56f9b5802df502af98512702a1ce7b2ea2043
2019-07-09 12:10:48 -07:00
Sam Saccone cd7eb25a33 Merge "Revert "this is the subject"" 2019-07-09 19:02:51 +00:00
Sam Saccone f722f36079 Revert "this is the subject"
This reverts commit 4091a00e39.

Reason for revert: bad submit

Change-Id: I4808614f2b399a086e7609ecc09d102d8d831e34
2019-07-09 18:57:36 +00:00
Treehugger Robot 73155879c5 Merge "this is the subject" 2019-07-09 18:56:34 +00:00
Xin Li b0c3474d91 DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master
Bug: 136196576
Change-Id: Icc51e3320747d5bb7bffb8ee7271effeca8ec199
2019-07-09 11:46:11 -07:00
Vic Yang baa9f50cb2 Implement range-based pin list
This extends the original pin list generation to support specifying a
range within a file.  If any part of a file is pinned, its local file
header in the APK file is pinned as well.

Test: Build cuttlefish.
Bug: 136040313
Bug: 135953430
Change-Id: I6de8c2b4c2f35c6bf257f61414c6bce761233e51
2019-07-09 10:37:19 -07:00
Andrew Chant 5d323c1714 Catch unicode decode errors search for kernel ver
If a kernel happens to decode to gibberish (including
non-ascii bytes), catch the decoding error when
searching for the kernel version.

Bug: 137041171
Merged-In: Ic035b3a5c8c80025cb3cede7b0fdcf8a2e5a35fd
Change-Id: Ic035b3a5c8c80025cb3cede7b0fdcf8a2e5a35fd
2019-07-09 17:02:48 +00:00
Pirama Arumuga Nainar 8550e0691a Merge "Add libprofile-extras to all link steps when NATIVE_COVERAGE is enabled." am: f5c3510081
am: eb7c5e3926

Change-Id: Idf1d4cff9082426b27b8a251f3f3759bb3883c10
2019-07-09 09:10:20 -07:00
Pirama Arumuga Nainar eb7c5e3926 Merge "Add libprofile-extras to all link steps when NATIVE_COVERAGE is enabled."
am: f5c3510081

Change-Id: Ib7a0595cd871ad193ff38bd138b8b015c56e843b
2019-07-09 08:57:05 -07:00
Pirama Arumuga Nainar f5c3510081 Merge "Add libprofile-extras to all link steps when NATIVE_COVERAGE is enabled." 2019-07-09 15:32:48 +00:00
SzuWei Lin df09892cdb Revise GSI targets to inherit from mainline_system directly
The patch seperates gsi_common.mk to aosp_product.mk and
gsi_release.mk. Let GSI targets can be inherit with 3 parts:

- system: mainline_system.mk
- product: aosp_product.mk
- vendor: none or emulator vendor makefiles

aosp_product.mk includes the AOSP packages/settings will be in
the product partition.

GSI targets also includes the gsi_release.mk, which contains
the special settings for the GSI for releasing, ex.
skip_mount.cfg, extra VNDK, etc. After the patch, the build
targets inherit from aosp_$arch.mk will not apply these special
settings anymore.

The gsi_common.mk, legacy_gsi_common.mk and aosp_$arch_ab.mk will
be phased out later.

Bug: 135502030
Test: build gsi_arm64-userdebug and aosp_arm64-userdebug, compare
Test: root, system and vendor in out folder with/without the patch
Change-Id: Ic604ac91ba9a704e6507bac324d19bbf68063464
2019-07-09 18:13:22 +08:00
Justin Yun fe113213fd Merge "Rename product_services to system_ext" am: b7a50ece30
am: 8f11ad5d40

Change-Id: I0de1702f60e307d0ca1d860b1ccc6f96ec9d3dc6
2019-07-09 02:25:26 -07:00
Justin Yun 8f11ad5d40 Merge "Rename product_services to system_ext"
am: b7a50ece30

Change-Id: I7a56d76d3543b2bc4b1d0b24e54e8dd82ab7f15a
2019-07-09 02:14:55 -07:00
Treehugger Robot b7a50ece30 Merge "Rename product_services to system_ext" 2019-07-09 08:58:04 +00:00
Justin Yun 6151e3f1ea Rename product_services to system_ext
Bug: 134359158
Test: build and check if system_ext.img is created
Change-Id: I67f2e95dd29eac6a28e07e24ea973d3a134c3bfc
2019-07-09 08:57:19 +00:00
Tao Bao ca82fc90f7 Additionally run releasetools_test with Python 3.
Bug: 131631303
Test: TreeHugger
Test: `atest releasetools_test`
Test: `atest releasetools_py3_test`
Change-Id: Ie00f48835aae41bc69ab8554b856a62aa3b497cc
2019-07-09 05:14:31 +00:00
Tao Bao 9b82724e26 Merge "releasetools: Make merge_target_files and its test Python 3 compatible." am: 6e3ae4e849
am: ec2f3da2a2

Change-Id: Ia42bceb60b8d5a0870b9623953a4972aecc44541
2019-07-08 21:28:54 -07:00
Tao Bao ec2f3da2a2 Merge "releasetools: Make merge_target_files and its test Python 3 compatible."
am: 6e3ae4e849

Change-Id: I0ee3f8801e194f140f32a4123100aa0e4f449a70
2019-07-08 21:19:53 -07:00
Tao Bao 6e3ae4e849 Merge "releasetools: Make merge_target_files and its test Python 3 compatible." 2019-07-09 03:58:32 +00:00
nelsonli b15f35c0b8 Merge "Build: Fix test data no present in test suite zip files." am: 98b9c5dded
am: 4cb85b5865

Change-Id: I9e6657014f1407ba68db345f85f7af98431b4291
2019-07-08 18:06:40 -07:00
nelsonli 4cb85b5865 Merge "Build: Fix test data no present in test suite zip files."
am: 98b9c5dded

Change-Id: Ifd655c5d413e8db73d0220b454a28aacc5a5173a
2019-07-08 17:57:40 -07:00
Treehugger Robot 98b9c5dded Merge "Build: Fix test data no present in test suite zip files." 2019-07-09 00:26:41 +00:00