Tao Bao
ed7923be4f
Merge "releasetools: Make additional modules Python 3 compatible."
...
am: e4f07795e4
2019-06-27 17:31:42 -07:00
Tao Bao
e4f07795e4
Merge "releasetools: Make additional modules Python 3 compatible."
2019-06-27 23:52:50 +00:00
Steve Muckle
2b7a7c7c8f
Merge "copy kernel modules to ramdisk, add modules.load[.recovery]"
...
am: c1d847e885
2019-06-27 15:42:34 -07:00
Tao Bao
d82b810a77
Merge "releasetools: Clean up check_target_files_signatures.py."
...
am: f6e8d46e2f
2019-06-27 15:41:38 -07:00
Tom Cherry
e7561bc59e
Merge "Switch host_init_verifier to getopt()"
...
am: fdbd55d259
2019-06-27 15:38:51 -07:00
Treehugger Robot
c1d847e885
Merge "copy kernel modules to ramdisk, add modules.load[.recovery]"
2019-06-27 21:52:56 +00:00
Tao Bao
f6e8d46e2f
Merge "releasetools: Clean up check_target_files_signatures.py."
2019-06-27 21:36:14 +00:00
Tom Cherry
fdbd55d259
Merge "Switch host_init_verifier to getopt()"
2019-06-27 21:09:07 +00:00
Tao Bao
03dc3694be
Merge "releasetools: Add sanity test for sign_apex."
...
am: 2a917796b5
2019-06-27 11:24:13 -07:00
Tao Bao
2a917796b5
Merge "releasetools: Add sanity test for sign_apex."
2019-06-27 17:35:29 +00:00
Tao Bao
a67e12d66f
releasetools: Clean up check_target_files_signatures.py.
...
And make it Python 3 compatibile.
Bug: 131631303
Test: python check_target_files_signatures.py target-files.zip
Test: python3 check_target_files_signatures.py target-files.zip
Change-Id: I38e868c3124387f5543ad68c92c75917e40b7d8f
2019-06-27 10:24:10 -07:00
Mathieu Chartier
92250e43a1
Merge "Revert "Revert "Remove option to create boot image based on preloaded classes"""
...
am: 14c01bea97
2019-06-27 09:22:40 -07:00
Tom Cherry
f0bc919754
Switch host_init_verifier to getopt()
...
Test: build, including init script verification, works
Change-Id: Ia786cdf14eb9449ad2d5a6ac9b571c6be709f1e5
2019-06-27 09:21:53 -07:00
Tao Bao
a370545a2c
releasetools: Make additional modules Python 3 compatible.
...
Bug: 131631303
Test: `python -m unittest test_sign_target_files_apks`
Test: `python3 -m unittest test_sign_target_files_apks`
Test: `python -m unittest test_add_img_to_target_files`
Test: `python3 -m unittest test_add_img_to_target_files`
Test: `python -m unittest test_ota_from_target_files`
Test: `python3 -m unittest test_ota_from_target_files`
Test: `python -m unittest test_validate_target_files`
Test: `python3 -m unittest test_validate_target_files`
Test: Run `python3 ota_from_target_files.py` to generate an OTA.
Test: Run `python3 sign_target_files_apks.py` to sign a target_files.
Change-Id: I56b45bbcbf7aa83e690785a9640c0212e45d12d8
2019-06-27 09:05:48 -07:00
Mathieu Chartier
14c01bea97
Merge "Revert "Revert "Remove option to create boot image based on preloaded classes"""
2019-06-27 15:56:52 +00:00
Anton Hansson
98b3c85628
Merge "Remove lmk.log_stats sysprop from mainline_system"
...
am: 6ce59eb4f6
2019-06-27 02:24:56 -07:00
Anton Hansson
6ce59eb4f6
Merge "Remove lmk.log_stats sysprop from mainline_system"
2019-06-27 08:28:18 +00:00
Kiyoung Kim
ed3c9a9ad6
Merge "Set INSTALLED_BOOTIMAGE_TARGET in case of TARGET_NO_KERNEL is true and BOARD_PREBUILT_BOOTIMAGE is set."
...
am: 6b261101e4
2019-06-26 23:04:31 -07:00
Kiyoung Kim
6b261101e4
Merge "Set INSTALLED_BOOTIMAGE_TARGET in case of TARGET_NO_KERNEL is true and BOARD_PREBUILT_BOOTIMAGE is set."
2019-06-27 05:44:33 +00:00
Kiyoung Kim
486bc8d590
Merge "Create common.LoadDictionaryFromFile"
...
am: fc195fee44
2019-06-26 18:14:33 -07:00
Kiyoung Kim
fc195fee44
Merge "Create common.LoadDictionaryFromFile"
2019-06-27 00:27:49 +00:00
Tao Bao
c9c1b864ba
releasetools: Add sanity test for sign_apex.
...
This ensures a matching interface between sign_apex and apex_utils.
The test apex `testdata/foo.apex` is generated by running
`system/apex/apexer/runtests.sh`.
Test: python -m unittest test_sign_apex
Test: atest releasetools_test
Change-Id: I7c14b1df2a3038ad206aa3e5aac084c47baaa00b
2019-06-26 17:17:09 -07:00
Steve Muckle
474e4d04a3
copy kernel modules to ramdisk, add modules.load[.recovery]
...
Build support exists to copy a set of kernel modules to the recovery,
vendor, and odm images. Extend similar support for copying kernel
modules to the ramdisk via BOARD_RAMDISK_KERNEL_MODULES. If
BOARD_USES_RECOVERY_AS_BOOT, then BOARD_RAMDISK_KERNEL_MODULES is
added to the set of modules to be copied to recovery.
Libmodprobe now supports reading a list of kernel modules to be loaded.
Enable the creation of modules.load and modules.load.recovery files.
These files contain the contents of
BOARD_[RAMDISK|VENDOR|ODM|RECOVERY]_KERNEL_MODULES_LOAD, or if those
variables are not set, the contents of
BOARD_[RAMDISK|VENDOR|ODM|RECOVERY]_KERNEL_MODULES (indicating all
modules should be loaded by default). This allows for
optional customization of the set of modules to be loaded by
libmodprobe and the order they are loaded in.
Bug: 130585369
Change-Id: I9340787d31d71aebc8552344675d9696c189a8a1
2019-06-26 17:16:30 -07:00
Mathieu Chartier
a5828f21f8
Revert "Revert "Remove option to create boot image based on preloaded classes""
...
Test: make
Test: build/soong/scripts/build-ndk-prebuilts.sh
This reverts commit 7139459ac7
2019-06-26 14:43:57 -07:00
Tao Bao
c82d8ceffc
Merge "releasetools: Clean up additional modules for Python 3 compatibility."
...
am: 90f638d842
2019-06-26 11:42:22 -07:00
Tao Bao
90f638d842
Merge "releasetools: Clean up additional modules for Python 3 compatibility."
2019-06-26 18:01:57 +00:00
Colin Cross
9e0a0d7a2a
Merge "Don't pass --legacy by default to aapt2 compile"
...
am: 1aa3ff6fea
2019-06-26 10:59:40 -07:00
Mathieu Chartier
db714424ba
Merge "Revert "Remove option to create boot image based on preloaded classes""
...
am: 669f3983fd
2019-06-26 10:19:48 -07:00
Colin Cross
1aa3ff6fea
Merge "Don't pass --legacy by default to aapt2 compile"
2019-06-26 17:05:34 +00:00
Mathieu Chartier
669f3983fd
Merge "Revert "Remove option to create boot image based on preloaded classes""
2019-06-26 16:52:45 +00:00
Mathieu Chartier
7139459ac7
Revert "Remove option to create boot image based on preloaded classes"
...
This reverts commit 633009b659
2019-06-26 16:45:01 +00:00
Mathieu Chartier
feae1549d9
Merge "Remove option to create boot image based on preloaded classes"
...
am: 5abcba9f43
2019-06-26 09:22:37 -07:00
Mathieu Chartier
5abcba9f43
Merge "Remove option to create boot image based on preloaded classes"
2019-06-26 15:56:36 +00:00
Anton Hansson
fd81f696ed
Remove lmk.log_stats sysprop from mainline_system
...
It is now set on the /product partition by relevant devices.
Bug: 135569569
Test: lunch mainline_system_arm64; inspect system/etc/prop.default
Change-Id: I34696977f584a65741c6002e6688d86e66a1f121
2019-06-26 15:49:10 +01:00
Anton Hansson
0796c70deb
Merge "Fix non-existing modules check"
...
am: c1d0bfef47
2019-06-26 03:06:48 -07:00
Anton Hansson
c1d0bfef47
Merge "Fix non-existing modules check"
2019-06-26 09:44:30 +00:00
Tao Bao
59cf0c59de
releasetools: Clean up additional modules for Python 3 compatibility.
...
It also addresses a few linter warnings (mostly regarding indentation).
Bug: 131631303
Test: TreeHugger
Test: `python -m unittest test_ota_from_target_files`
Test: `python3 -m unittest test_ota_from_target_files`
Test: `python build/make/tools/releasetools/check_ota_package_signature.py
build/make/target/product/security/testkey.x509.pem
test-keys-signed-ota.zip`
Test: `python3 build/make/tools/releasetools/check_ota_package_signature.py
build/make/target/product/security/testkey.x509.pem
test-keys-signed-ota.zip`
Change-Id: I11a745dfec052081ab0282bb028dc27debf71f57
2019-06-26 00:15:53 -07:00
Kiyoung Kim
ebe7c9c92f
Create common.LoadDictionaryFromFile
...
There are some places defining same file open function and use
common.LoadDictionaryFromLines. This commit creates
LoadDictionaryFromFile to reduce some code redundancy.
Test: m -j & atest passed
Change-Id: I6a3fa48693095937f8c79ce6f3c110b6862a1967
2019-06-26 13:09:52 +09:00
Dan Willemsen
59bb6e4ba8
Merge "Install shared library dependencies for 64-bit windows"
...
am: 7ec8749eb8
2019-06-25 17:43:47 -07:00
Treehugger Robot
7ec8749eb8
Merge "Install shared library dependencies for 64-bit windows"
2019-06-25 23:57:46 +00:00
Tao Bao
6855138e15
Merge "Stop passing --block and MKBOOTIMG to ota_from_target_files."
...
am: ac0749ff98
2019-06-25 16:16:36 -07:00
Tao Bao
ac0749ff98
Merge "Stop passing --block and MKBOOTIMG to ota_from_target_files."
2019-06-25 23:05:45 +00:00
Tao Bao
da5b3b5178
Merge "releasetools: Make apex_utils Python 3 compatible."
...
am: 58abe77060
2019-06-25 15:57:32 -07:00
Tao Bao
58abe77060
Merge "releasetools: Make apex_utils Python 3 compatible."
2019-06-25 22:34:39 +00:00
Elliott Hughes
9b8d9396ea
Merge "Don't use tar's -p with -rf, where it makes no sense."
...
am: 2fdfc4e439
2019-06-25 15:22:45 -07:00
Elliott Hughes
2fdfc4e439
Merge "Don't use tar's -p with -rf, where it makes no sense."
2019-06-25 21:28:22 +00:00
Mathieu Chartier
633009b659
Remove option to create boot image based on preloaded classes
...
Using the preloaded classes to generate the image is no longer
supported.
Test: make
Change-Id: I63fa47395e9f7ee2967522ae2c02676283fb2d31
2019-06-25 13:52:59 -07:00
Anton Hansson
528fdc021f
Fix non-existing modules check
...
This variable was accidentally changed to refer to the
shorthand PRODUCT_XYZ instead of PRODUCTS.<mk>.PRODUCT_XYZ
in a previous mass-migration, but that shorthand didn't
exist for these variables. Add it in.
Also whitelist the offender introduced since it was broken.
Test: lunch generic; m nothing
Change-Id: I29dd73c29796743e770afa0c2ceb4f8583dc6e1e
2019-06-25 21:52:58 +01:00
Tao Bao
c931547560
Stop passing --block and MKBOOTIMG to ota_from_target_files.
...
- `--block` has been a no-op since Oreo [1] -- ota_from_target_files
will always build block-based OTAs or A/B OTAs.
- MKBOOTIMG is no longer needed when calling ota_from_target_files, at
least for the callsite in Makefile. Because target_files.zip has been
including boot/recovery images since Lollipop [2].
This CL also switches to long options to improve readability.
[1] commit 457cbf6a8a3c84f56948
2019-06-25 13:04:06 -07:00
Dan Willemsen
b88f792d25
Install shared library dependencies for 64-bit windows
...
Test: m host_cross_libandroidicu_64; see libs in out/host/windows-x86/lib64
Change-Id: Ibf816aeb96e70b70cfcb9b58df9605c3af87db39
2019-06-25 12:56:41 -07:00
