Commit Graph

53972 Commits

Author SHA1 Message Date
Dimitry Ivanov 9c7ab5944e Merge "Add NativeBridgeRelativePath config variables" 2019-07-16 09:17:35 +00:00
SzuWei Lin b3e9fc2219 Add default LMK properties to GSI
These LMK properties are product properties. The configuration will
be absent when GSI is installed as GSI doesn't mount the product
partition. Without these settings, some CTS test cases could
fail due to an aggressive LMK.

The patch puts these properties in GSI as default values.

Bug: 136212765
Bug: 134460917
Test: `run cts -m CtsFileSystemTestCases`, all pass
Change-Id: I6fde8db51debcb9bb269aece3a3e4c7e5bb991f6
Merged-In: I6fde8db51debcb9bb269aece3a3e4c7e5bb991f6
(cherry picked from commit 9547929af4)
2019-07-16 16:53:12 +08:00
Ryan Prichard 8426a19969 envsetup: avoid adding "::" (the cwd) to the PATH
Fix this error:

    rprichard@cashew:/x/aosp/out/target/product/walleye/system/bin$ ls
    bash: ./ls: cannot execute binary file: Exec format error

Bug: none
Test: lunch a target, "echo $PATH | grep ::"
Test: lunch an arm target, cd $OUT/system/bin, ls (
Change-Id: I2c0d5ece85964dffa14d6ac8df168dd4e733162e
2019-07-15 18:16:35 -07:00
Tianjie Xu 41976c725c Factor out the image classes to break circular dependency
This helps to break the circular dependency between common and
blockimgdiff.

Bug: 32379627
Test: unit tests pass
Change-Id: I90b5ff34782acbfac86f36265bd96c207d898bf6
2019-07-15 17:02:23 -07:00
Andrew Chant 9f4b16dd1c Merge "Catch unicode decode errors search for kernel ver" am: 2b4828a564
am: 1db284ff10

Change-Id: Ic9f9e59afda59721faa8129cba19c38ac5275b3a
2019-07-15 12:11:50 -07:00
Andrew Chant 1db284ff10 Merge "Catch unicode decode errors search for kernel ver"
am: 2b4828a564

Change-Id: Ieed4020a6490d44c4be1780eec08e501ed1e2219
2019-07-15 11:58:41 -07:00
Tianjie Xu 173378a4bc Merge "Add update_host_simulator to otatools" am: f70815cbd2
am: 09f64c0cd5

Change-Id: I61dbba9a5bdd8c0d0398dd05b45d77df321d278d
2019-07-15 11:42:38 -07:00
Treehugger Robot 2b4828a564 Merge "Catch unicode decode errors search for kernel ver" 2019-07-15 18:33:57 +00:00
Tianjie Xu 09f64c0cd5 Merge "Add update_host_simulator to otatools"
am: f70815cbd2

Change-Id: I48acd7a3754a771aebbd94252f41448c983684b2
2019-07-15 11:32:36 -07:00
Dan Shi 757a503749 [automerger skipped] Update auto-gen test config template with EXTRA_CONFIGS placeholder
am: 8d5459fc6d -s ours
am skip reason: change_id I2fdae79d45fd1e5866ee94d1f0e59df106be2a87 with SHA1 4c55da09db is in history

Change-Id: I96bbb1e612c457b98f94c43c1263f646b42e4140
2019-07-15 11:03:44 -07:00
Tianjie Xu f70815cbd2 Merge "Add update_host_simulator to otatools" 2019-07-15 18:00:16 +00:00
Dan Shi 8d5459fc6d Update auto-gen test config template with EXTRA_CONFIGS placeholder
Bug: 134509111
Bug: 136633978
Test: add "require_root: true" to init_benchmarks and libpower_test
build the modules, confirm the extra target preparer is added in the
test config.

Change-Id: I2fdae79d45fd1e5866ee94d1f0e59df106be2a87
Merged-In: I2fdae79d45fd1e5866ee94d1f0e59df106be2a87
2019-07-15 17:29:42 +00:00
Logan Chien 737930417c Merge changes Ia0410da8,Id756340f am: 1277b8cca1
am: 014de67d06

Change-Id: Ibaf191d2e94815bca92adcb4f9aa2e2fb1d4b3c7
2019-07-13 14:13:32 -07:00
Logan Chien 014de67d06 Merge changes Ia0410da8,Id756340f
am: 1277b8cca1

Change-Id: Ideb6440a6e0b1738c08beb021eace76c907ab685
2019-07-13 14:04:53 -07:00
Logan Chien 1277b8cca1 Merge changes Ia0410da8,Id756340f
* changes:
  Strip my_shared_libraries to remove space char
  Move cxx_stl_setup.mk out of ifdef
2019-07-13 20:56:04 +00:00
Steve Muckle 2b3fc786ff Merge "install modules.softdep from depmod output" am: 10115f54b9
am: b81725dff1

Change-Id: Ic7184870b76c3ce0d474cd5ec16f33bc449b0a0b
2019-07-12 16:11:49 -07:00
Steve Muckle b81725dff1 Merge "install modules.softdep from depmod output"
am: 10115f54b9

Change-Id: I3b8ac4d326b09da334eb29bcf5b7ff197247bbd9
2019-07-12 16:02:48 -07:00
Treehugger Robot 10115f54b9 Merge "install modules.softdep from depmod output" 2019-07-12 22:20:22 +00:00
Daniel Norman e9d5439c8b Merge "Changes host_init_verifier to use hidl interface inheritance hierarchy." am: 858fa08427
am: 0d1b2ddaad

Change-Id: Id83e3ac8e0c62ed84598f650d30b2c52b549f6f8
2019-07-12 11:41:32 -07:00
Daniel Norman 0d1b2ddaad Merge "Changes host_init_verifier to use hidl interface inheritance hierarchy."
am: 858fa08427

Change-Id: I4257caefab23a66d34f3160e922bff5e140e002d
2019-07-12 11:32:38 -07:00
Chen Zhu 075f84d9d0 Merge "Add Mainline Test Suite (MTS) to build." into qt-dev
am: 3538cebfc7

Change-Id: I9cfcfd627a2a221090ec2fa2f8e8c7a6d572ec1c
2019-07-12 11:32:20 -07:00
Chen Zhu 3538cebfc7 Merge "Add Mainline Test Suite (MTS) to build." into qt-dev 2019-07-12 18:05:00 +00:00
Daniel Norman 858fa08427 Merge "Changes host_init_verifier to use hidl interface inheritance hierarchy." 2019-07-12 18:01:46 +00:00
Logan Chien e984ebbb57 Strip my_shared_libraries to remove space char
This commit strips my_shared_libraries to remove the unwanted space
character when both `$(filter-out ...)` and
`$(my_system_shared_libraries)` are empty.

Bug: 137302468
Test: lunch aosp_walleye-userdebug && make
Test: lunch aosp_walleye-userdebug && make check-elf-files
Change-Id: Ia0410da877196c104a61d48c92a2be969a9754a5
2019-07-12 10:26:50 -07:00
Logan Chien a45d6f5ee9 Move cxx_stl_setup.mk out of ifdef
This commit moves `include cxx_stl_setup.mk` out of `ifdef
my_shared_libraries` so that it can always get a chance to tweak
my_shared_libraries.

Bug: 137302468
Test: lunch aosp_walleye-userdebug && make
Test: lunch aosp_walleye-userdebug && make check-elf-files
Change-Id: Id756340f0a62d7ac06d301c3260430a1af74ed89
2019-07-12 10:26:50 -07:00
Elliott Hughes 6e1c4787c0 Merge "Stop building unnecessary tarballs." am: 9a4b84de56
am: 7a45e0ccb9

Change-Id: If2517dd20dd9c6ab5b96511ee923ca72d93c4e57
2019-07-12 08:19:03 -07:00
Tao Bao 8938906fa6 [automerger skipped] Merge "releasetools: Ignore nonexistent APEX overrides." am: d077c5b88e
am: 0f6c1d2b47 -s ours
am skip reason: change_id I2bad0f5c00753ed36ec5ae3431c7dc2ff1fc3e9c with SHA1 b369c7226a is in history

Change-Id: Ia348c8e8555e2ada9f54a4a03a3e5ee1b338d91d
2019-07-12 08:10:10 -07:00
Elliott Hughes 7a45e0ccb9 Merge "Stop building unnecessary tarballs."
am: 9a4b84de56

Change-Id: I9465ce123bc1d5ab9662069af6181dd7382eff57
2019-07-12 08:10:05 -07:00
Tao Bao 0f6c1d2b47 Merge "releasetools: Ignore nonexistent APEX overrides."
am: d077c5b88e

Change-Id: Idc8e680e3140599f81c5f9cdc33e2a647a95a300
2019-07-12 08:00:29 -07:00
Elliott Hughes 9a4b84de56 Merge "Stop building unnecessary tarballs." 2019-07-12 14:52:53 +00:00
Tao Bao d077c5b88e Merge "releasetools: Ignore nonexistent APEX overrides." 2019-07-12 14:42:37 +00:00
dimitry fb2449f7b7 Add NativeBridgeRelativePath config variables
This will allow us to unhardcode relative paths for native-bridge
binaries in soong.

Test: make PRODUCT-cf_x86_phone-userdebug
Change-Id: I72b33ee610c92d41e1370fcaa1512529c5d7c88c
2019-07-12 16:08:00 +02:00
Tao Bao 3422309d6d 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
Merged-In: I2bad0f5c00753ed36ec5ae3431c7dc2ff1fc3e9c
(cherry picked from commit b369c7226a)
2019-07-12 00:25:41 -07:00
Elliott Hughes 440c99f1f2 Stop building unnecessary tarballs.
Test: treehugger
Change-Id: Iaba2aa6d09ad891f37171cc76778d08c78c78f93
2019-07-12 05:04:12 +00:00
Steve Muckle 044d3d8e5c Merge "add BOARD_VENDOR_RAMDISK_KERNEL_MODULES[_LOAD]" am: 3f7c416650
am: 155c1cef48

Change-Id: I17e35f9b32fa7e073ab3f226b93810f71b85d6da
2019-07-11 21:57:46 -07:00
Steve Muckle 155c1cef48 Merge "add BOARD_VENDOR_RAMDISK_KERNEL_MODULES[_LOAD]"
am: 3f7c416650

Change-Id: I1930149589978edeebb4c00eb2bda56beca7c7b4
2019-07-11 21:48:46 -07:00
Treehugger Robot 3f7c416650 Merge "add BOARD_VENDOR_RAMDISK_KERNEL_MODULES[_LOAD]" 2019-07-12 04:14:36 +00:00
Elisa Pascual Trevino 2008c27b84 Merge "Update Security String to 2019-09-05 Bug: 137199979" into qt-dev
am: 61920cbf99

Change-Id: I13a2c396390d5b518f4af00d69db925a77851fbb
2019-07-11 20:50:52 -07:00
TreeHugger Robot 61920cbf99 Merge "Update Security String to 2019-09-05 Bug: 137199979" into qt-dev 2019-07-12 03:26:43 +00:00
Steve Muckle 0f7bb1b84b install modules.softdep from depmod output
The modules.softdep file is used to communicate soft dependencies
between modules and is supported by libmodprobe.

Bug: 130585369
Change-Id: I790ea872fde7fb0cb58e07277a32aa4688adcac6
2019-07-11 17:50:05 -07:00
Steve Muckle 69280d22e6 add BOARD_VENDOR_RAMDISK_KERNEL_MODULES[_LOAD]
To accommodate a future vendor ramdisk, recognize
BOARD_VENDOR_RAMDISK_KERNEL_MODULES and
BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD as a way to specify kernel
modules to be stored on the vendor ramdisk, and the optional override list of
kernel modules to be loaded by first stage init.

For now this will affect the modules loaded on the generic ramdisk,
but will provide a way for vendors to add support now and hopefully not
have to modify it later when the vendor ramdisk is created.

BOARD_RAMDISK_KERNEL_MODULES is renamed to
BOARD_GENERIC_RAMDISK_KERNEL_MODULES, which is not expected to be
modified by vendors.

Bug: 137297791
Change-Id: I05944e004ab5235172da3a15b8d1c6f4c4c021ce
2019-07-11 23:53:36 +00:00
Tao Bao 0e3da21c63 Merge "releasetools: Ignore nonexistent APEX overrides." into qt-dev
am: a6935cc16a

Change-Id: I29beed93ff052ae1b23d6305e659f162371fb31d
2019-07-11 16:33:35 -07:00
TreeHugger Robot a6935cc16a Merge "releasetools: Ignore nonexistent APEX overrides." into qt-dev 2019-07-11 23:03:00 +00:00
Vic Yang bebef49503 Merge "Implement range-based pin list" am: f90ec83802
am: ea3740650c

Change-Id: Iecce8926bde3610c0339cd8f22185e81c73a3a23
2019-07-11 15:52:30 -07:00
Vic Yang ea3740650c Merge "Implement range-based pin list"
am: f90ec83802

Change-Id: Ie5fcabc992569a05d4d12aa3689aa2bcad0d81d4
2019-07-11 15:44:27 -07:00
Elisa Pascual Trevino b5a665a9a2 Update Security String to 2019-09-01 Bug: 137199979
am: 4364982766

Change-Id: I2a804b86283905edf0e7d2f54bc199ebe1110f8e
2019-07-11 15:43:21 -07:00
Elisa Pascual Trevino ac6e24e5b1 Update Security String to 2019-09-05
Bug: 137199979
2019-07-11 22:26:27 +00:00
Treehugger Robot f90ec83802 Merge "Implement range-based pin list" 2019-07-11 22:21:03 +00:00
Elisa Pascual Trevino 4364982766 Update Security String to 2019-09-01
Bug: 137199979
2019-07-11 22:20:00 +00:00
Xin Li ca849cd2af [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master" am: 8eec867605 -s ours
am: 46552556a2 -s ours
am skip reason: subject contains skip directive

Change-Id: I838f3732fb9475fbae795adac01194b33c533372
2019-07-11 11:58:39 -07:00