Commit Graph

53535 Commits

Author SHA1 Message Date
Chih-hung Hsieh be06ed28b5 Merge "Fix pylint warnings and now prefer python3" am: 7b3a8fb7ec
am: ebb825c42d

Change-Id: I31a58138b7a1e19ca4819c824bea89592ca50acc
2019-06-25 11:55:14 -07:00
Tao Bao b1b275873c Merge "Clean up the dependencies for user image creation." am: ec53f441fa
am: 8ae72adb4b

Change-Id: Ica87f15572d10b384e13436ec63572922df8de7c
2019-06-25 11:52:02 -07:00
Chih-hung Hsieh ebb825c42d Merge "Fix pylint warnings and now prefer python3"
am: 7b3a8fb7ec

Change-Id: I10cddc0d4b4e9e47d43811ca7826bb297331b76b
2019-06-25 11:41:09 -07:00
Tao Bao 8ae72adb4b Merge "Clean up the dependencies for user image creation."
am: ec53f441fa

Change-Id: I522712e697d61054a841fbc600a23d4fe4c6ea84
2019-06-25 11:35:27 -07:00
Chih-hung Hsieh 7b3a8fb7ec Merge "Fix pylint warnings and now prefer python3" 2019-06-25 18:32:26 +00:00
Tao Bao ec53f441fa Merge "Clean up the dependencies for user image creation." 2019-06-25 17:57:43 +00:00
Isaac Chen 378f856e9c Merge "Add lpunpack to otatools for rebuilding super.img" am: 17a3aa4819
am: 7f338d71d0

Change-Id: Ic91d89e1fafddf7e286a637d2b38db3acfd61248
2019-06-25 10:38:55 -07:00
Isaac Chen 7f338d71d0 Merge "Add lpunpack to otatools for rebuilding super.img"
am: 17a3aa4819

Change-Id: I016704bb685699b61bdb24f242ba39102ac44d67
2019-06-25 10:28:48 -07:00
Isaac Chen 17a3aa4819 Merge "Add lpunpack to otatools for rebuilding super.img" 2019-06-25 17:19:46 +00:00
Tao Bao 41e98f654c Merge changes Idc7776be,I409fe30a am: ec8e2b4e02
am: 70b5b96565

Change-Id: I33df35895fc75347dfda3cacdf717f75df7ba14d
2019-06-25 10:09:32 -07:00
Tao Bao 70b5b96565 Merge changes Idc7776be,I409fe30a
am: ec8e2b4e02

Change-Id: Ieea68e3ee56fc978761e9d2691667e5fb50bcf04
2019-06-25 10:03:33 -07:00
Tao Bao ec8e2b4e02 Merge changes Idc7776be,I409fe30a
* changes:
  releasetools: Make verity_utils Python 3 compatible.
  releasetools: Make common Python 3 compatible.
2019-06-25 16:35:35 +00:00
Tao Bao 9e893c3cfd releasetools: Make verity_utils Python 3 compatible.
Bug: 131631303
Test: TreeHugger
Test: `python -m unittest test_verity_utils`
Test: `python3 -m unittest test_verity_utils`
Change-Id: Idc7776be2cf78fbdb0b3ba87231d05013da8d3ac
2019-06-24 21:07:19 -07:00
Tao Bao da30cfae96 releasetools: Make common Python 3 compatible.
Bug: 131631303
Test: TreeHugger
Test: `python -m unittest test_common`
Test: `python3 -m unittest test_common`
Change-Id: I409fe30a5d71975c1d7b66e5e749843de530f1f9
2019-06-24 21:02:12 -07:00
Isaac Chen eec4a7cba4 Add lpunpack to otatools for rebuilding super.img
lpunpack is needed to repackage super.img for mixed-image virtual devices.
For Cuttlefish, it's included in host package. We need to include it in
otatools.zip so Goldfish or other devices can use it to mix their super images.
Necessary SOs are the same as lpmake and have been included in otatools.zip.

Bug: 134461288
Test: $ lunch aosp_x86-userdebug
      $ m otatools-package
      $ unzip -l $OUT/ota* | grep lpunpack
        467824  2008-01-01 00:00   bin/lpunpack

Change-Id: Ie2092f18afb88721b29b1738847a0b781dbcd431
2019-06-25 11:50:58 +08:00
Tao Bao 1b1c093c74 Merge "Fix an issue in setting up PATH." am: 9392fb3905
am: eb13604f24

Change-Id: I90bc221f6c71196a0995fcd8b41acd4fb32bb66a
2019-06-24 16:32:49 -07:00
Tao Bao eb13604f24 Merge "Fix an issue in setting up PATH."
am: 9392fb3905

Change-Id: I0450debf88146872039e63f48a79bea890d3638b
2019-06-24 16:18:35 -07:00
Tao Bao dba635a3b7 Clean up the dependencies for user image creation.
The dependency on MAKE_EXT4FS (mke2fs) has been covered by the rule for
MKEXTUSERIMG (mkuserimg_mke2fs):
https://android.googlesource.com/platform/system/extras/+/refs/heads/master/ext4_utils/Android.bp

The dependency on mksquashfs and img2simg comes from mksquashfsimage.sh,
which has been moved into mksquashfsimage's building rule.

This CL also fixes the ordering of INTERNAL_USERIMAGES_BINARY_PATHS,
which should come after adding all the binaries to
INTERNAL_USERIMAGES_DEPS.

Test: TreeHugger
Change-Id: I8b30bf87860d9711e88eecca4b76db72f5cd8241
2019-06-24 15:47:47 -07:00
Tao Bao 9392fb3905 Merge "Fix an issue in setting up PATH." 2019-06-24 22:34:53 +00:00
Chih-Hung Hsieh 9018ea49d8 Fix pylint warnings and now prefer python3
* Read/write warning messages as utf-8 strings.
* No more embedded raw utf-8 code in file.

Test: ./warn.py --csvpath warnings.csv build.log > warnings.html
Change-Id: Ie51700721a32bede1d3b250f4a42fd8facd6af75
2019-06-24 15:24:39 -07:00
Patrice Arruda c77cf34d71 Merge "Revert "Revert "Deprecate bash m* commands and use the soong's modules-in* build commands instead.""" am: f26a4e459e
am: 7c01c3fbab

Change-Id: I8b1ad2572da67ad333fa2e56fcbfc2e9d4a19cb0
2019-06-24 14:34:15 -07:00
Colin Cross 53e64b96ff Merge "Allow passing --legacy in LOCAL_AAPT_FLAGS" am: 4188cc5c5c
am: 20aa21225b

Change-Id: Id861971f30adac718101f7ff3d305299669e5ef5
2019-06-24 14:33:14 -07:00
Patrice Arruda 7c01c3fbab Merge "Revert "Revert "Deprecate bash m* commands and use the soong's modules-in* build commands instead."""
am: f26a4e459e

Change-Id: I3b9722f646ed22def5ebbd594110f06325b85486
2019-06-24 14:31:00 -07:00
Colin Cross 20aa21225b Merge "Allow passing --legacy in LOCAL_AAPT_FLAGS"
am: 4188cc5c5c

Change-Id: I763787eb3dc076732dcb2fc28799837624a4fd1f
2019-06-24 14:29:28 -07:00
Tao Bao cf821fc963 Fix an issue in setting up PATH.
`PATH=$(foreach p,$(INTERNAL_USERIMAGES_BINARY_PATHS),$(p):)$$PATH` will
produce a space separated string due to `foreach`, if
$(INTERNAL_USERIMAGES_BINARY_PATHS) has more than one string. We didn't
hit the issue in the past because $(INTERNAL_USERIMAGES_BINARY_PATHS)
had contained only one path in practice.

Test: TreeHugger
Change-Id: I74ef4356668af63d871a81f6bfd4c9324aa1d956
2019-06-24 14:08:36 -07:00
Treehugger Robot f26a4e459e Merge "Revert "Revert "Deprecate bash m* commands and use the soong's modules-in* build commands instead.""" 2019-06-24 20:31:29 +00:00
Treehugger Robot 4188cc5c5c Merge "Allow passing --legacy in LOCAL_AAPT_FLAGS" 2019-06-24 17:13:44 +00:00
Tao Bao cebd118790 Merge "releasetools: Remove some legacy paths for prop rewrites." am: eb7cb468e4
am: f589f9bb2d

Change-Id: I637506dfc84a4a4aee8f8ee744b4e3ff6d5d0642
2019-06-24 09:24:59 -07:00
Tao Bao f589f9bb2d Merge "releasetools: Remove some legacy paths for prop rewrites."
am: eb7cb468e4

Change-Id: Id85da350e6f7a39438a4ca8536ad3ad67c2a1493
2019-06-24 08:58:01 -07:00
Tao Bao eb7cb468e4 Merge "releasetools: Remove some legacy paths for prop rewrites." 2019-06-24 15:47:33 +00:00
Colin Cross 18f28c7781 Allow passing --legacy in LOCAL_AAPT_FLAGS
--legacy will soon no longer be passed by default to all aapt2
compiles.  Allow it to be specified in LOCAL_AAPT_FLAGS by passing
it to aapt2 compile when it is present and filtering it out from
the flags passed to aapt2 link.

Bug: 135597368
Test: m java
Change-Id: I92792cf6a0d4c6ecf5e0971523bd0ab76c81345f
2019-06-22 13:03:09 -07:00
Tao Bao 338c1b7e90 releasetools: Remove some legacy paths for prop rewrites.
sign_target_files_apks.py only needs to take care of the current
release. The legacy paths of ODM/build.prop, VENDOR/odm/build.prop, and
BOOT/RAMDISK/default.prop no longer exist in the target_files.zip from
master.

The other two cases of ROOT/default.prop and
RECOVERY/RAMDISK/default.prop are still kept in the code, as they will
still exist (as symlink or conditionally).

Test: Run sign_target_files_apks.py against
      aosp_taimen-target_files.zip. Check the rewritten prop files.
Test: `python -m unittest test_sign_target_files_apks`
Change-Id: I5e70bc2ccc0f3dcf0eace0718c59a3b0f89a9ff4
2019-06-21 10:26:15 -07:00
Tao Bao add1f28ba4 Merge "releasetools: Make blockimgdiff Python 3 compatible." am: 4daa755fb2
am: 07a7471ddb

Change-Id: Ia91938e7efed299dc212dfa2c9116634e67dafd1
2019-06-21 08:25:58 -07:00
Tao Bao 07a7471ddb Merge "releasetools: Make blockimgdiff Python 3 compatible."
am: 4daa755fb2

Change-Id: Ie4bce8614bf34527be23ccaf56d976840e557c71
2019-06-21 08:06:39 -07:00
SzuWei Lin 9c546c05c4 [automerger skipped] Enforce property split in GSI
am: e40cc936ff -s ours
am skip reason: change_id Ib200d66cf98fea572c26338e058bce29eb5e0cd7 with SHA1 79e0d25c33 is in history

Change-Id: I1859d275ef02d66a694f7cebf816cafe0b13dcff
2019-06-21 08:05:39 -07:00
Tao Bao 4daa755fb2 Merge "releasetools: Make blockimgdiff Python 3 compatible." 2019-06-21 14:23:09 +00:00
Mitch Phillips 233b84e45e Merge "Remove experimental pass manager for fuzzer builds." am: 4ba3984b4c
am: 8581054652

Change-Id: I1d0bced14989b55d24040cda407f1f8de10ad6b1
2019-06-20 18:18:21 -07:00
Dan Willemsen e3ff87a873 Merge "Revert "Deprecate bash m* commands and use the soong's modules-in* build commands instead."" am: 27c05b2405
am: 2221072aa7

Change-Id: I46512055099021c7db927b2701bf3769e28b5a8b
2019-06-20 18:17:57 -07:00
Dan Shi c0b9ef62aa Merge "Create individual build artifact for test suite build output" am: 3771cff834
am: 4c7f8954b5

Change-Id: I6532e0dbadc940d663d2ab4312be357429e33ea8
2019-06-20 18:17:41 -07:00
Tao Bao 8c9cc5fbc1 Merge "releasetools: Make rangelib Python 3 compatibile." am: 1f1aafa30d
am: 207f624f75

Change-Id: Iba18162ab1c05ec780b057f1391b1f9aaf0b4039
2019-06-20 18:17:23 -07:00
Mitch Phillips 8581054652 Merge "Remove experimental pass manager for fuzzer builds."
am: 4ba3984b4c

Change-Id: I0c2e18e38cdfa5e649c07b04462a3bb0756166f9
2019-06-20 18:08:59 -07:00
Dan Willemsen 2221072aa7 Merge "Revert "Deprecate bash m* commands and use the soong's modules-in* build commands instead.""
am: 27c05b2405

Change-Id: I52ec972a59a0f8021d6bd4e164686c625b57f6d4
2019-06-20 18:08:29 -07:00
Dan Shi 4c7f8954b5 Merge "Create individual build artifact for test suite build output"
am: 3771cff834

Change-Id: I6ce849a9745dfa1df9165bab9f4a3926aeead502
2019-06-20 18:08:10 -07:00
Tao Bao 207f624f75 Merge "releasetools: Make rangelib Python 3 compatibile."
am: 1f1aafa30d

Change-Id: I92b2e47669d0b8e4bfa089354102efeb106a8a16
2019-06-20 18:07:45 -07:00
Treehugger Robot 4ba3984b4c Merge "Remove experimental pass manager for fuzzer builds." 2019-06-21 00:51:26 +00:00
SzuWei Lin e40cc936ff Enforce property split in GSI
Pure GSI build targets has no vendor partition, such as
aosp_$arch_ab and gsi_$arch. The system properties defined by
PRODUCT_PROPERTY_OVERRIDES will be in /system/build.prop.

The patch defined a fake BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE to
let these system properties flow to vendor and won't pollute the
system.img.

The bug also move some properties to /product/build.prop.

Bug: 135508595
Bug: 131162245
Bug: 134781120
Test: check the /system/build.prop do not have "ro.carrier=unknown"
Test: adb remount on GSI Q on P
Change-Id: Ib200d66cf98fea572c26338e058bce29eb5e0cd7
Merged-In: Ib200d66cf98fea572c26338e058bce29eb5e0cd7
(cherry picked from commit 711d696eb3af759c63c416b0224faeac1f6c04f1)
2019-06-21 00:35:45 +00:00
Patrice Arruda fa7204b0e1 Revert "Revert "Deprecate bash m* commands and use the soong's modules-in* build commands instead.""
This reverts commit c4dae4d7ab.

Reason for revert: Fix available: go/aog/987391

Change-Id: I0a6cd679699488da716c30b95c62af89b6aa4f1a
2019-06-20 23:40:33 +00:00
Dan Willemsen 27c05b2405 Merge "Revert "Deprecate bash m* commands and use the soong's modules-in* build commands instead."" 2019-06-20 22:35:06 +00:00
Patrice Arruda c4dae4d7ab Revert "Deprecate bash m* commands and use the soong's modules-in* build commands instead."
This reverts commit 610b6302cf.

Reason for revert: m mlibc from root dir works. Create a tmp dir and then cd in to tmp. Run the same command and it fails.

Change-Id: I0f0c056d7e668da621ae99d347a055ecdf2dec07
2019-06-20 22:32:46 +00:00
Tao Bao b813120af1 releasetools: Make blockimgdiff Python 3 compatible.
Bug: 131631303
Test: `python -m unittest test_blockimgdiff`
Test: `python3 -m unittest test_blockimgdiff`
Change-Id: I8cf072ca4af6a525bc675cba0be998ff7be7f4f1
2019-06-20 14:30:30 -07:00