Shawn Willden
e7003e9f8d
Merge "Add Keymaster 4.1" am: 394d65b41e
...
am: e18ddbbf82
Change-Id: I7b1fc711e12972d1bc90f7daeb5adb88e3633bf6
2019-11-21 14:57:33 -08:00
Shawn Willden
e18ddbbf82
Merge "Add Keymaster 4.1"
...
am: 394d65b41e
Change-Id: Id91ddda5b9c25b385954e2e76e43dc544a86cb83
2019-11-21 14:53:43 -08:00
Treehugger Robot
394d65b41e
Merge "Add Keymaster 4.1"
2019-11-21 22:41:49 +00:00
Yifan Hong
0aa817b41b
Merge "releasetools: fix avbtool arguments." am: bdb8090522
...
am: cf98e3f512
Change-Id: Iae778c3b37340966f15f49f36b900c57d12ed425
2019-11-21 13:20:43 -08:00
Yifan Hong
cf98e3f512
Merge "releasetools: fix avbtool arguments."
...
am: bdb8090522
Change-Id: Ic0dc8ea94f3ccdeb2277fff1ba0789aeaaf62c62
2019-11-21 13:17:43 -08:00
Yifan Hong
bdb8090522
Merge "releasetools: fix avbtool arguments."
2019-11-21 20:52:55 +00:00
Martin Stjernholm
951411d9e9
Merge "Reland "Add libdl_android as a bootstrap library"." am: 675aa4b093
...
am: 7bf7a0cec2
Change-Id: I7c6c9e4c40ffe75bbb1a04f3f3161ba23a4b896d
2019-11-21 08:36:49 -08:00
Martin Stjernholm
7bf7a0cec2
Merge "Reland "Add libdl_android as a bootstrap library"."
...
am: 675aa4b093
Change-Id: I3e4e8e76a2c0039229d5bbc6e359a830a470ff24
2019-11-21 08:29:58 -08:00
Martin Stjernholm
675aa4b093
Merge "Reland "Add libdl_android as a bootstrap library"."
2019-11-21 16:17:42 +00:00
Justin Yun
d3eb960e4e
Merge "Inherit base system_ext.mk files for aosp targets" am: e948114a3d
...
am: 945096110d
Change-Id: Ie845e05c84c0b780b16abd7a84521c60e0710bfd
2019-11-20 22:27:54 -08:00
Justin Yun
945096110d
Merge "Inherit base system_ext.mk files for aosp targets"
...
am: e948114a3d
Change-Id: Ic9c360aba510a6ebfa0b5d966db4be92164e01c1
2019-11-20 22:24:24 -08:00
Donghoon Yu
92420db7dd
releasetools: fix avbtool arguments.
...
The following error occurred when building dist.
Separate these arguments
error log:
avbtool: error: unrecognized arguments: --partition_name vendor_boot
Bug: 144820089
Change-Id: I3891ef3bd9a2f7d2cd1377228b9894b599dc1cc3
Signed-off-by: Donghoon Yu <hoony.yu@samsung.com>
2019-11-21 06:15:02 +00:00
Treehugger Robot
e948114a3d
Merge "Inherit base system_ext.mk files for aosp targets"
2019-11-21 06:14:06 +00:00
Steve Muckle
d24f472781
Merge "add BOARD_*_KERNEL_MODULE_ARCHIVE support" am: cedced8471
...
am: 3d14362ad2
Change-Id: I19aa0077cfa3aa047684944e0431877b93855a50
2019-11-20 15:09:52 -08:00
Steve Muckle
3d14362ad2
Merge "add BOARD_*_KERNEL_MODULE_ARCHIVE support"
...
am: cedced8471
Change-Id: Ifd20422472c760a5c82e1eb134e6fecc588ba1be
2019-11-20 15:06:21 -08:00
Justin Yun
e58ffe4681
Inherit base system_ext.mk files for aosp targets
...
Make aosp targets inherit handheld_system_ext.mk and
telephony_system_ext.mk files.
Devices that have /system_ext or /system/system_ext must inherit any
of *_system_ext.mk files to install mandatory packages for system_ext
partition.
Bug: 144542478
Test: Build aosp targets
Change-Id: Ibdbf0000ac4aa98c8485d67827f52208f9a827c5
2019-11-20 22:58:42 +00:00
Treehugger Robot
cedced8471
Merge "add BOARD_*_KERNEL_MODULE_ARCHIVE support"
2019-11-20 22:57:39 +00:00
Shawn Willden
8e2b776def
Add Keymaster 4.1
...
Bug: 140193672
Bug: 140192237
Bug: 140824829
Test: Will be in a future CL
Change-Id: I1dccdf1ba06dc834e31d20c782523c92666847be
2019-11-20 12:14:36 -07:00
Jakub Pawlowski
c8305f48e3
Merge "bluetooth: V1.1" am: e6c1e50be8
...
am: 51f99d3879
Change-Id: Ib4b68a922b526aabf4f6f8f3237bb800652a0060
2019-11-20 11:01:55 -08:00
Jakub Pawlowski
51f99d3879
Merge "bluetooth: V1.1"
...
am: e6c1e50be8
Change-Id: I9d51bb99ccb24d25f3c374c5d5c5a35e782c6580
2019-11-20 10:57:55 -08:00
Steve Muckle
810a0ba56f
add BOARD_*_KERNEL_MODULE_ARCHIVE support
...
It may be the case that the list of kernel modules to be copied into
various partitions is not known at the time the build is invoked. To
support this configuration, create a set of make variables, each of
which can be set to the path of a zip archive of kernel modules to be
used.
Bug: 144317186
Bug: 144844424
Test: build and verify *.ko in vendor, repackage prebuilt
kernel modules into zip, build and verify *.ko in vendor
Change-Id: Ie6f7e2c72efa11d39be341920dd46e4ed6678fe1
2019-11-20 10:46:13 -08:00
Jakub Pawlowski
e6c1e50be8
Merge "bluetooth: V1.1"
2019-11-20 18:42:10 +00:00
Jakub Pawlowski
777d38b5a6
bluetooth: V1.1
...
Add ISO
Bug: 144413056
Change-Id: Ice792cf552b0c494499fb855eee711b518850918
2019-11-20 00:48:24 +01:00
Martin Stjernholm
15ca2ffbb2
Reland "Add libdl_android as a bootstrap library".
...
Necessary after moving it into the Runtime APEX, as several framework
libraries loaded during early boot depends on it, e.g. libvndksupport.so,
libvulkan.so, and libgraphicsenv.so.
Test: build & boot
Bug: 135753770
Bug: 144343305
Change-Id: Ia95349e377605d709fae74d966bd4f2324eaf604
2019-11-19 16:35:47 +00:00
Jerome Gaillard
ee9718c01e
[automerger skipped] Allow files generated by droidstubs to be copied in the SDK am: 7aa3039ef9
am: 8be676d24a
...
am: e5ab595059
-s ours
am skip reason: change_id I7a0b22907603e1d17ac05901ee7f8bb9cff89f7f with SHA1 a0171af06f
is in history
Change-Id: Ifc807f1442002e886efbfe207b94b57ba7bd7f1c
2019-11-19 04:32:50 -08:00
Jerome Gaillard
e5ab595059
Allow files generated by droidstubs to be copied in the SDK am: 7aa3039ef9
...
am: 8be676d24a
Change-Id: Ifd141dd407eadacc4bcc6b5002b7d66da8d3d6d5
2019-11-19 04:29:16 -08:00
Jerome Gaillard
8be676d24a
Allow files generated by droidstubs to be copied in the SDK
...
am: 7aa3039ef9
Change-Id: Ief97856b0633e4100856f9e507755b15cef8c4d3
2019-11-19 04:25:39 -08:00
Jerome Gaillard
7aa3039ef9
Allow files generated by droidstubs to be copied in the SDK
...
We need to get files generated by a droidstubs target into the SDK. So
we first copy them into the out/target/common/obj/PACKAGING folder where
they can be picked up by the SDK build.
Bug: 142480924
Test: m sdk
Change-Id: I7a0b22907603e1d17ac05901ee7f8bb9cff89f7f
Merged-In: I7a0b22907603e1d17ac05901ee7f8bb9cff89f7f
2019-11-18 10:38:13 +00:00
Chih-hung Hsieh
8f1cc39d04
Merge "Set NATIVE_TESTS executable like EXECUTABLES" am: 74a4605a6d
...
am: dc9de09156
Change-Id: If57ed10bcd33cda769ef9077a6f3420edbdcf6a9
2019-11-15 22:05:18 -08:00
Chih-hung Hsieh
dc9de09156
Merge "Set NATIVE_TESTS executable like EXECUTABLES"
...
am: 74a4605a6d
Change-Id: Ib656ccf3b45bd2b2b9095de8d27417f0ca9442cc
2019-11-15 19:06:29 -08:00
Chih-hung Hsieh
74a4605a6d
Merge "Set NATIVE_TESTS executable like EXECUTABLES"
2019-11-16 02:31:33 +00:00
Chih-Hung Hsieh
ef17769720
Set NATIVE_TESTS executable like EXECUTABLES
...
* Rust test modules should have NATIVE_TESTS class,
not EXECUTABLES, to work with atest --host.
Bug: 140938178
Test: make rust projects
Change-Id: I45c84284d894702471ea46faaa599de27ab6be51
2019-11-15 14:10:09 -08:00
Lubo Hristov
466c8fd3b2
Set SPL to 2020-01-05
...
am: 12489ad00b
Change-Id: Idb89d6e4dfb1515166add8b72fe526d4572e1a06
2019-11-15 12:23:17 -08:00
Lubo Hristov
5eb7b066a1
Set SPL to 2020-01-01
...
am: 07e7d6b643
Change-Id: I7e4e99e0da7387b13c94059b7ab1beb98ac47591
2019-11-15 12:23:14 -08:00
Colin Cross
6f441e0266
Merge "Set pools manually for rules that can run in RBE or goma" am: 9d789145fa
...
am: bf28e91640
Change-Id: I5e798cb96c98eff91ca9df96343b641119fa1ee2
2019-11-15 10:45:11 -08:00
Colin Cross
bf28e91640
Merge "Set pools manually for rules that can run in RBE or goma"
...
am: 9d789145fa
Change-Id: I3ea73fcd278b6a60d381d84776e7bde95691d059
2019-11-15 10:41:11 -08:00
Colin Cross
9d789145fa
Merge "Set pools manually for rules that can run in RBE or goma"
2019-11-15 18:19:33 +00:00
Lubo Hristov
12489ad00b
Set SPL to 2020-01-05
...
bug:144373594
2019-11-15 17:22:42 +00:00
Steven Laver
fff56eb0c2
Merge "releasetools: build_super_image.py should unpack */build.prop" am: e24ef86473
...
am: 392b31f58e
Change-Id: If27423b07d7ff37571af50a3369f6c45ecab8939
2019-11-14 20:50:35 -08:00
Steven Laver
392b31f58e
Merge "releasetools: build_super_image.py should unpack */build.prop"
...
am: e24ef86473
Change-Id: I64d7eabb1e842705093040df307b3867f1f60c11
2019-11-14 20:46:32 -08:00
Treehugger Robot
e24ef86473
Merge "releasetools: build_super_image.py should unpack */build.prop"
2019-11-15 04:34:02 +00:00
Steven Laver
f43fa9dd99
releasetools: build_super_image.py should unpack */build.prop
...
build_super_image.py attempts to retrieve the "ro.product.device"
property, which requires parsing the */build.prop files from the target
files package. This fixes the following error:
"ExternalError: couldn't resolve ro.product.device"
Test: ./otatools/releasetools/build_super_image.py -p ./otatools
aosp_arm64-target_files.zip super.img
Change-Id: I592524a27b1a4e7544644b1a344071cff9718942
2019-11-14 23:47:31 +00:00
Chih-hung Hsieh
00f1509b9f
Merge "Add rust_host_test_config_template.xml" am: 83131cbef9
...
am: f84e7da928
Change-Id: I90b69136531316530c8a9f10815834d265bb0100
2019-11-14 13:26:24 -08:00
Chih-hung Hsieh
f84e7da928
Merge "Add rust_host_test_config_template.xml"
...
am: 83131cbef9
Change-Id: I259eb82edb52cebe9b87d5ffc7f2a0fd79973b66
2019-11-14 13:22:34 -08:00
Chih-hung Hsieh
83131cbef9
Merge "Add rust_host_test_config_template.xml"
2019-11-14 21:10:39 +00:00
Chih-Hung Hsieh
43abe9590f
Add rust_host_test_config_template.xml
...
* Derived from python_binary_host_test_config_template.xml
Bug: 140938178
Test: make rust projects
Change-Id: I050e310c25952d7ca7af25ca2803f98817e465c8
2019-11-14 09:57:13 -08:00
Justin Yun
bf2bb0ae49
Merge "Add /persist symlink to mainline_arm64" am: 0b6de0b173
...
am: 0a856c6682
Change-Id: I067bfad7384cb6ea12cf1ff79049997c2debdb01
2019-11-13 23:01:00 -08:00
Justin Yun
0a856c6682
Merge "Add /persist symlink to mainline_arm64"
...
am: 0b6de0b173
Change-Id: Ic228a95b485907acfa06ae2f8116cfb95f83917d
2019-11-13 22:57:30 -08:00
Justin Yun
0b6de0b173
Merge "Add /persist symlink to mainline_arm64"
2019-11-14 06:48:53 +00:00
Lubo Hristov
07e7d6b643
Set SPL to 2020-01-01
...
bug:144373594
2019-11-14 05:14:40 +00:00