Commit Graph

41026 Commits

Author SHA1 Message Date
Dan Willemsen d927abe8a8 Clear some aapt2.mk inputs after use
my_generated_res_dirs wasn't being reset in some cases in between
different modules. To be safe, clear every input variable that I was sure
was not being used by the caller after aapt2.mk.

Test: m
Test: m ANDROID_BUILDSPEC=vendor/google/build/app_build_spec.mk
Change-Id: I37c861d99637cad77a2a378a119bf66cee373b3a
2017-11-15 17:00:46 -08:00
Tao Bao c6a0e208ab Remove the redundant/wrong write of 'recovery_as_boot='.
The deleted lines contain a bug that only writes "recovery_as_boot="
into META/misc_info.txt when the value is empty. The issue has no real
impact though, because a) it's no-op for targets not using
BOARD_USES_RECOVERY_AS_BOOT (e.g. non-A/B targets); b) for targets with
BOARD_USES_RECOVERY_AS_BOOT := true, the value gets written correctly as
part of the call to 'generate-userimage-prop-dictionary'.

Test: `m dist` on aosp_bullhead-userdebug. The line is gone from
      META/misc_info.txt.
Test: `m dist` on aosp_marlin-userdebug. 'recovery_as_boot=true' exists
      in META/Misc_info.txt.
Change-Id: I9b4d70d457e141aa308ba2e62e2033602c8012de
2017-11-15 15:04:44 -08:00
Tomasz Wasilczyk 463dcf37f8 Merge "Silence superfluous build messages." am: 4dbdb60698
am: a62800487e

Change-Id: I1c2f39812f1be01940887aed70c630f7e9b64a0f
2017-11-15 22:39:21 +00:00
Tomasz Wasilczyk a62800487e Merge "Silence superfluous build messages."
am: 4dbdb60698

Change-Id: I3574184c22b8fca41fd85e09ceacc2b598643c67
2017-11-15 22:35:48 +00:00
Tomasz Wasilczyk 4dbdb60698 Merge "Silence superfluous build messages." 2017-11-15 22:27:30 +00:00
Dan Willemsen c8921864da Merge "Silence PRODUCT_COPY_FILES ignored messages" am: 288521a615
am: fe590192de

Change-Id: I60fd37059077b2d8ad76239e3ce8c1591b1d6e63
2017-11-15 22:02:48 +00:00
Dan Willemsen fe590192de Merge "Silence PRODUCT_COPY_FILES ignored messages"
am: 288521a615

Change-Id: Ie0a346d18d3b6d0fa7dc0242f0f1bb6ecdce6aad
2017-11-15 21:59:13 +00:00
Treehugger Robot 288521a615 Merge "Silence PRODUCT_COPY_FILES ignored messages" 2017-11-15 21:51:46 +00:00
Dan Willemsen 403b98aa25 Silence PRODUCT_COPY_FILES ignored messages
We don't have great alternatives for some of these use cases, so for now
just silence them, writing them to $OUT/product_copy_files_ignored.txt
(and if `dist' is specified, $DIST_DIR/logs/product_copy_files_ignored.txt)

Test: lunch aosp_arm-userdebug; m nothing
Test: lunch aosp_arm-userdebug; m dist
Change-Id: If0228bc8d907346e3505ae136cb477ef37a5c867
2017-11-15 11:13:23 -08:00
Tao Bao 29472b1848 Merge "releasetools: Fix the size check for AVB images." am: 905c84cada
am: 029b3b6619

Change-Id: I60768378bfaa57fa47ad5a89d235a060d06e887c
2017-11-15 18:45:40 +00:00
Tomasz Wasilczyk 29ec06b7ba Silence superfluous build messages.
Bug: 69315492
Test: it builds
Change-Id: Ic02484b80fa27c53786204402930ed5f33ec7fda
2017-11-15 10:34:01 -08:00
Tao Bao 029b3b6619 Merge "releasetools: Fix the size check for AVB images."
am: 905c84cada

Change-Id: I4321bb226c8e77536fd0896980c64ac4ed680e37
2017-11-15 18:32:38 +00:00
Tao Bao 905c84cada Merge "releasetools: Fix the size check for AVB images." 2017-11-15 18:15:20 +00:00
Jiyong Park 3d4268b3af Merge "Keep PRODUCT_FULL_TREBLE to true even when some requirements are not met" am: 8a89848373
am: ad9feb4cac

Change-Id: I54af75ed4397752cf8b8a9996a2d38d7d5be6f84
2017-11-15 01:37:04 +00:00
Jiyong Park ad9feb4cac Merge "Keep PRODUCT_FULL_TREBLE to true even when some requirements are not met"
am: 8a89848373

Change-Id: If19df9e3560456c2f69e2faa54fe3cbbb1c045cb
2017-11-15 01:27:56 +00:00
Xin Li b9156758fa Merge commit '66b8b530187b129934a685bf0c4349eef00e4b0c' from oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master.
am: 44dd4881de  -s ours

Change-Id: Iee04f4f8cec1570edffb2fe69400c5d494903af2
2017-11-15 01:27:47 +00:00
Tao Bao 262bf3f0b5 releasetools: Fix the rebuilding of vbmeta.img.
If only vbmeta.img is missing from the target_files.zip,
'add_img_to_target_files.py -a' will fail to re-create vbmeta.img.

++++ vbmeta ++++

Traceback (most recent call last):
  File "./build/make/tools/releasetools/add_img_to_target_files.py", line 693, in <module>
    main(sys.argv[1:])
  File "./build/make/tools/releasetools/add_img_to_target_files.py", line 687, in main
    AddImagesToTargetFiles(args[0])
  File "./build/make/tools/releasetools/add_img_to_target_files.py", line 584, in AddImagesToTargetFiles
    boot_contents = boot_image.WriteToTemp()
AttributeError: 'NoneType' object has no attribute 'WriteToTemp'

Because it has skipped loading the boot.img, which leads to the above error.

Bug: 63456822
Test: As follows:
  $ zip -d target_files.zip vbmeta.img
  $ add_img_to_target_files.py -a target_files.zip
Test: `m dist` on aosp_arm64-userdebug
Change-Id: Ieba5f0b6848c3ec5d8bcfd24d48cc5af8b39f06c
2017-11-14 17:05:57 -08:00
Tao Bao 9dd909e6db releasetools: Fix the size check for AVB images.
When generating full OTAs for AVB-enabled targets, it fails the size
assertion for boot.img.

  ERROR: boot size (31457280) is 100.00% of limit (31457280)

The size assumption is no longer true for AVB-signed images, because
the actual image size should be always identical to the limit.

Bug: 67841177
Test: Enable AVB on bullhead. `m dist`.
Change-Id: I9bd432ccd88094628eb71308554839549eccb6d9
2017-11-14 15:43:36 -08:00
Treehugger Robot 8a89848373 Merge "Keep PRODUCT_FULL_TREBLE to true even when some requirements are not met" 2017-11-14 22:14:28 +00:00
Xin Li 44dd4881de Merge commit '66b8b530187b129934a685bf0c4349eef00e4b0c' from
oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master.

Change-Id: I7594bb72dd7e847292eb502edd918e41318aac29
Merged-In: Ide82473d358719f7e01cd2a4a85db954f3722f14
2017-11-14 11:36:22 -08:00
Tianjie Xu fd0011a9bb Merge "Add multithread support to call imgdiff with block-limit" am: 5d60cd2d3e
am: 13680814dc

Change-Id: I772ccc6540bdf2fe41e70ae8e959094918717c29
2017-11-14 18:59:06 +00:00
Tianjie Xu 13680814dc Merge "Add multithread support to call imgdiff with block-limit"
am: 5d60cd2d3e

Change-Id: I9fe115f791a913f483626fe5e2b1043b8e799cd8
2017-11-14 18:56:58 +00:00
Tianjie Xu 5d60cd2d3e Merge "Add multithread support to call imgdiff with block-limit" 2017-11-14 18:54:08 +00:00
Jiyong Park 55e17a753e Keep PRODUCT_FULL_TREBLE to true even when some requirements are not met
When some of the full treble requirements are turned off,
PROUCT_FULL_TREBLE became false, which in turn cleared macro variables
guarded in treble: {cflags: "..."}.

Until when Soong recognizes each of the requirements (e.g.
treble_sepolicy: { }), don't reset PRODUCT_FULL_TREBLE to false
even when some of the requirements are not met.

Bug: 62019611
Bug: 68710251
Test: get_build_var PRODUCT_FULL_TREBLE returns true for aosp_walleye
Test: aosp_walleye boots to the UI
Change-Id: Iad3ee4f4462c82e9f9e1897f3ec019cdd16da358
2017-11-14 19:14:44 +09:00
Jaekyun Seok 9e760a3da2 Merge "Move system default values in system partition" am: 7c61a4eaef
am: cc29444e0a

Change-Id: I8a9290c7d10c9f5330c9b9e3c09c00163cb8bf1b
2017-11-14 06:05:26 +00:00
Jaekyun Seok cc29444e0a Merge "Move system default values in system partition"
am: 7c61a4eaef

Change-Id: I42cf2aecb3d2d1be25f58d91925fcfe3ee7e4558
2017-11-14 06:00:21 +00:00
Treehugger Robot 7c61a4eaef Merge "Move system default values in system partition" 2017-11-14 05:57:14 +00:00
Jaekyun Seok 4022ec99a6 Move system default values in system partition
The following properties are specified under platform/build as system
default values.

- tombstoned.max_tombstone_count
- debug.atrace.tags.enableflags
- dalvik.vm.dex2oat-minidebuginfo

So they should move into system partition.

Bug: 64661857
Test: confirmed that the default properties were stored in
/system/etc/prop.default on sailfish device
Change-Id: Ic34c05fd9761e281962b6bb425e4babedfca45a9
2017-11-14 05:43:35 +00:00
Elisa Pascual Trevino d067fd3c74 [DO NOT MERGE] Update Security String to 2018-01-05 from 2018-01-01 Bug: 69257226 am: b58800a22c am: ec071e07df
am: 43738d2a71

Change-Id: I63edb214802f3e1de48fe845cf528ba6ce39e1f1
2017-11-14 00:57:03 +00:00
Elisa Pascual Trevino 43738d2a71 [DO NOT MERGE] Update Security String to 2018-01-05 from 2018-01-01 Bug: 69257226 am: b58800a22c
am: ec071e07df

Change-Id: I8b625eee6ed5b782649d7a6d4b98b3e3acc4ac31
2017-11-14 00:54:25 +00:00
Elisa Pascual Trevino ec071e07df [DO NOT MERGE] Update Security String to 2018-01-05 from 2018-01-01 Bug: 69257226
am: b58800a22c

Change-Id: I15c6ee36fe858323759bcd91132b604adf0c3cc5
2017-11-14 00:52:23 +00:00
Alex Deymo a1c5d47708 Merge "Update binary name to "brotli"." am: cbb4ec6cf0
am: ea26c8104e

Change-Id: I330a67434c9d69c3c9d9aadae495e92d9788928c
2017-11-13 22:58:16 +00:00
Tianjie Xu 2536607d90 Add multithread support to call imgdiff with block-limit
With the new implementation of handling large apks, we need to call
imgdiff with block-limit to split the apk and generate the patch at
the same time. The call to imgdiff would significantly increase the
time consumption of the "FindTransfers" function which we used to
execute sequentially. This cl addresses this issue and speeds up the
process by making the imgdiff call parallel.

Bug: 34220646
Test: Create and sideload an incremental package for angler
Change-Id: Id62e348418fc1d22e32ea6c8ac16d9ab3ec92d7b
2017-11-13 14:58:05 -08:00
Alex Deymo ea26c8104e Merge "Update binary name to "brotli"."
am: cbb4ec6cf0

Change-Id: Idd96e18f08b67568e84d75bcd460a6bad0a1c42f
2017-11-13 22:51:23 +00:00
Alex Deymo cbb4ec6cf0 Merge "Update binary name to "brotli"." 2017-11-13 22:43:22 +00:00
Elisa Pascual Trevino b58800a22c [DO NOT MERGE] Update Security String to 2018-01-05 from 2018-01-01
Bug: 69257226
2017-11-13 22:23:06 +00:00
Elisa Pascual Trevino 0185c51295 Merge "[DO NOT MERGE] Update Security String to 2018-01-01 from 2017-12-05 Bug: 69257226" into oc-dev am: 9a8d84b8ed am: ec439b54fb
am: ed2f52ccb5

Change-Id: Icb90f760be666a1115a0b3d7b1f85fb143752181
2017-11-13 22:01:23 +00:00
Elisa Pascual Trevino ed2f52ccb5 Merge "[DO NOT MERGE] Update Security String to 2018-01-01 from 2017-12-05 Bug: 69257226" into oc-dev am: 9a8d84b8ed
am: ec439b54fb

Change-Id: I54c898d6a0d0dd5edc4ecbd6a069741079aaa3ea
2017-11-13 21:56:16 +00:00
Elisa Pascual Trevino ec439b54fb Merge "[DO NOT MERGE] Update Security String to 2018-01-01 from 2017-12-05 Bug: 69257226" into oc-dev
am: 9a8d84b8ed

Change-Id: I01c2010599a495aec3943cda02ea22f85fdae29d
2017-11-13 21:54:22 +00:00
TreeHugger Robot 9a8d84b8ed Merge "[DO NOT MERGE] Update Security String to 2018-01-01 from 2017-12-05 Bug: 69257226" into oc-dev 2017-11-13 21:47:00 +00:00
Steven Moreland 9f719cdac2 Merge changes from topic "full-treble-split" am: 1f70f332fe
am: 73bacf3f2b  -s ours

Change-Id: I34d7041a1124d07e398fe43b0d376517b60a6d00
2017-11-13 21:14:26 +00:00
Steven Moreland 18d75a29c3 Use PRODUCT_ENFORCE_VINTF_MANIFEST. am: 9588438023
am: cb71efa50a

Change-Id: I01e7bd1eeba8ef1f9203f8d2256b862591663e9e
2017-11-13 21:14:05 +00:00
Steven Moreland 73bacf3f2b Merge changes from topic "full-treble-split"
am: 1f70f332fe

Change-Id: I3351fed398e5f7b8be190330e46944f9e7e05f47
2017-11-13 21:11:01 +00:00
Steven Moreland cb71efa50a Use PRODUCT_ENFORCE_VINTF_MANIFEST.
am: 9588438023

Change-Id: I7202cd5f9b858f7f90cca60d2c5c2ea7d79499c8
2017-11-13 21:10:13 +00:00
Treehugger Robot 1f70f332fe Merge changes from topic "full-treble-split"
* changes:
  Break up PRODUCT_FULL_TREBLE into variables.
  Use PRODUCT_ENFORCE_VINTF_MANIFEST.
2017-11-13 21:06:34 +00:00
Elisa Pascual Trevino a9f64fc95a Merge "[DO NOT MERGE] Update Security String to 2018-01-01 Bug: 69257226" into nyc-dev am: 5b0a42789a am: 3fea140429 am: 7a58ff0c94 am: 590dbe143d am: 71b1a4d8ea -s ours am: a80c186e97 am: 38b24d03b5
am: 14900aad64

Change-Id: Ie1c54e9c39a2e528558c4c47bce35a638917fa25
2017-11-13 21:02:31 +00:00
Elisa Pascual Trevino 14900aad64 Merge "[DO NOT MERGE] Update Security String to 2018-01-01 Bug: 69257226" into nyc-dev am: 5b0a42789a am: 3fea140429 am: 7a58ff0c94 am: 590dbe143d am: 71b1a4d8ea -s ours am: a80c186e97
am: 38b24d03b5

Change-Id: I7d2228b403f83f71a8be76684c8b2dc751828264
2017-11-13 21:00:27 +00:00
Elisa Pascual Trevino 38b24d03b5 Merge "[DO NOT MERGE] Update Security String to 2018-01-01 Bug: 69257226" into nyc-dev am: 5b0a42789a am: 3fea140429 am: 7a58ff0c94 am: 590dbe143d am: 71b1a4d8ea -s ours
am: a80c186e97

Change-Id: Ibcb992519fc57f6e257dced49b78283d5aca39c5
2017-11-13 20:57:17 +00:00
Elisa Pascual Trevino a80c186e97 Merge "[DO NOT MERGE] Update Security String to 2018-01-01 Bug: 69257226" into nyc-dev am: 5b0a42789a am: 3fea140429 am: 7a58ff0c94 am: 590dbe143d
am: 71b1a4d8ea  -s ours

Change-Id: I862603d1941915c360b0dda3698da88ac7859748
2017-11-13 20:53:29 +00:00
Elisa Pascual Trevino 71b1a4d8ea Merge "[DO NOT MERGE] Update Security String to 2018-01-01 Bug: 69257226" into nyc-dev am: 5b0a42789a am: 3fea140429 am: 7a58ff0c94
am: 590dbe143d

Change-Id: Iffff10dd426f956a4a99b3177b0e4863e532c70e
2017-11-13 20:49:54 +00:00