Commit Graph

53666 Commits

Author SHA1 Message Date
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
Kiyoung Kim 62e2231b82 Set INSTALLED_BOOTIMAGE_TARGET in case of TARGET_NO_KERNEL is true and
BOARD_PREBUILT_BOOTIMAGE is set.

Based on current Makefile INSTALLED_BOOTIMAGE_TARGET always kept as
empty if TARGET_NO_KERNEL is true, so build fails with empty out path.
This change is to set up INSTALLED_BOOTIMAGE_TARGET with
$(PRODUCT_OUT)/boot.img in case of TARGET_NO_KERNEL is true and
BOARD_PREBUILT_BOOTIMAGE is defined.

Bug: 135648566
Test: m -j passed
Change-Id: I9658f215c2e2cc5d87040d5085521ef44722c4ef
2019-06-24 09:45:28 +09:00
Colin Cross fd5fa34775 Don't pass --legacy by default to aapt2 compile
Don't pass --legacy by default, it is rarely necessary and converts
some errors into warnings that crash at runtime.  The modules that
need it have had --legacy added to LOCAL_AAPT_FLAGS.

Bug: 135597368
Test: m java
Change-Id: I0cb213599d6612746d988b8966cbd529b5328db0
2019-06-22 13:04:51 -07: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
Dan Shi 3771cff834 Merge "Create individual build artifact for test suite build output" 2019-06-20 20:30:34 +00:00
Dan Shi 51b789e422 Create individual build artifact for test suite build output
This change creates following build artifacts that are currently part of
device-tests.zip and general-tests.zip. The smaller build artifacts are
used to reduce the download size required to run TradeFed suite.
Detailed design can be found in the bug.

From device-tests
device-tests_configs: include all test config files in device-tests, zip
  file is less than 1MB.

From general-tests
general-tests_configs: include all test config files in general-tests,
  zip file is less than 1MB.
general-tests_host-shared-libs: include tools and shared libraries
  required to run host side test, zip file is about 60MB

Bug: 73786521
Test: make device-tests and general-tests, verify output.
Change-Id: I34c9aa3c1c672d5d58eab6de92198a7b8e4a681c
2019-06-20 10:02:36 -07:00
Tao Bao 1f1aafa30d Merge "releasetools: Make rangelib Python 3 compatibile." 2019-06-20 14:51:21 +00:00
Jaewoong Jung 9bc1ceb1c9 Merge "Fixes a typo in a comment." am: fde688ebc8
am: 35aebeb18a

Change-Id: Icee0466bf2134b11e8c4c4dc3ece046102fbca87
2019-06-19 23:06:51 -07:00
Jaewoong Jung 35aebeb18a Merge "Fixes a typo in a comment."
am: fde688ebc8

Change-Id: I353ba051074592462f0abf428a53936b8e79ab54
2019-06-19 22:49:46 -07:00
Treehugger Robot fde688ebc8 Merge "Fixes a typo in a comment." 2019-06-20 04:20:36 +00:00
SzuWei Lin d20c8a5e36 Merge "Enforce property split in GSI" am: 345ed53d98
am: 0148d6e91e

Change-Id: Idedcab0c0c5ad079be83ddb7820c1427bb2e7f65
2019-06-19 19:55:26 -07:00
SzuWei Lin 0148d6e91e Merge "Enforce property split in GSI"
am: 345ed53d98

Change-Id: Id3593c2dc1f3dd9f9eb8b787a9fa576a0dc40b7c
2019-06-19 19:37:25 -07:00
Treehugger Robot 345ed53d98 Merge "Enforce property split in GSI" 2019-06-20 01:53:15 +00:00
Patrice Arruda 0ecaa2eb75 Merge "Deprecate bash m* commands and use the soong's modules-in* build commands instead." am: 9bcf0376ab
am: 1d6a8f9f51

Change-Id: If155e8729d302a41e09fee910a0b1b16972ef428
2019-06-19 18:34:54 -07:00
Patrice Arruda 1d6a8f9f51 Merge "Deprecate bash m* commands and use the soong's modules-in* build commands instead."
am: 9bcf0376ab

Change-Id: Ice610847f73ddb0ab52a0edffe2f7ea80a825d0d
2019-06-19 17:53:31 -07:00
Treehugger Robot 9bcf0376ab Merge "Deprecate bash m* commands and use the soong's modules-in* build commands instead." 2019-06-20 00:20:23 +00:00
Tao Bao 0f68744f1e Merge "releasetools: Make common.ZipWriteStr Python 3 compatible." am: 9521c802ec
am: 0812ce4e3d

Change-Id: Ia3009e10b5b9492b6ab50135dce4a77ffc978011
2019-06-19 15:56:45 -07:00
Tao Bao 0812ce4e3d Merge "releasetools: Make common.ZipWriteStr Python 3 compatible."
am: 9521c802ec

Change-Id: I5a3f78a25990848963a467df19bb26b3c306f8f6
2019-06-19 15:39:18 -07:00
Patrice Arruda 610b6302cf Deprecate bash m* commands and use the soong's modules-in* build commands instead.
The functionality of m* envsetup.sh commands has been implemented in
soong_ui. The bash functionality of m* commands can be replaced by
soong's modules-in* build commands.

Fixes: b/130049705
Test: * Loaded the envsetup.sh on a new environment
      * Executed each m* command.
      * Verified with "type <build command>" to make sure
        the function generation is correct.
      * Ran on Darwin environment.

Change-Id: I8792e4f1f1727aba2ca6ee4bdfe657f6ac42302a
2019-06-19 14:16:38 -07:00
Tao Bao 9521c802ec Merge "releasetools: Make common.ZipWriteStr Python 3 compatible." 2019-06-19 21:09:01 +00:00
Tao Bao d660c8d8f3 releasetools: Make rangelib Python 3 compatibile.
Bug: 131631303
Test: `python -m unittest test_rangelib`
Test: `python3 -m unittest test_rangelib`
Change-Id: Ia8e26623d5967f2eea003252ee56b861350d626b
2019-06-19 10:30:34 -07:00
Isaac Chen 0f2046ec59 Merge "Disable apex update for GSI" am: 435dcbb845
am: 2f7bc0874a

Change-Id: I919365b57157c7cf726063071efaf382c70eb311
2019-06-19 03:56:45 -07:00
Isaac Chen 2f7bc0874a Merge "Disable apex update for GSI"
am: 435dcbb845

Change-Id: I57b8499eff8bc4839286b5383444e2713ed2cea2
2019-06-19 03:51:44 -07:00