Commit Graph

41046 Commits

Author SHA1 Message Date
Chih-hung Hsieh c982ae3728 Merge "Recognize new clang-tidy android-* warnings." am: 315761ace1
am: dafe61c817

Change-Id: Iebf015a5351d46ba6331908c7a945fd661d1de6e
2017-11-17 17:16:58 +00:00
Chih-hung Hsieh dafe61c817 Merge "Recognize new clang-tidy android-* warnings."
am: 315761ace1

Change-Id: I516702a4bad35c6a4ec34f33bf42fa004400a860
2017-11-17 17:13:27 +00:00
Chih-hung Hsieh 315761ace1 Merge "Recognize new clang-tidy android-* warnings." 2017-11-17 17:07:49 +00:00
Tobias Thierer 7ef760b832 Tweak comments for OpenJDK 9 build toolchain logic.
This addresses review comments on the preceding CL
http://r.android.com/539055

Test: Treehugger
Change-Id: Icb0674190db3d638546a0ed49dbcb97d0698e549
2017-11-17 15:35:59 +00:00
Bowgo Tsai b855c0c304 Reorder assert-max-image-size and AVB signing
This change fixes the following warning message:
  WARNING: out/target/product/$(TARGET_DEVICE)/boot.img approaching \
  size limit (33554432 now; limit 33554432)

This is because AVB signing will increase boot.img to
BOARD_BOOTIMAGE_PARTITION_SIZE, in order to place the AVB metadata at
the end of the partition. We should check max image size first then use
avbtool to sign it.

The max allowed size will be (partition size - AVB_HASH_META_SIZE) when
AVB is enabled.

Bug: 69115400
Test: build and checks there is no size limit warning message
Change-Id: If9545e64a0d1714a2ec2440f9bd38293e7b1ba9a
2017-11-17 23:25:38 +08:00
Tobias Thierer 24df8fa38f Merge "Break EXPERIMENTAL_USE_OPENJDK9 into {USE,TARGET}_OPENJDK9." am: 446c9ba370
am: 4ffaa14478

Change-Id: I89a3223bde03cf5b6d48da3125bb7ab043b89c1e
2017-11-17 15:23:29 +00:00
Tobias Thierer 4ffaa14478 Merge "Break EXPERIMENTAL_USE_OPENJDK9 into {USE,TARGET}_OPENJDK9."
am: 446c9ba370

Change-Id: I0254955fa16e8b35396f9f350c961031272c6583
2017-11-17 15:19:30 +00:00
Tobias Thierer 446c9ba370 Merge "Break EXPERIMENTAL_USE_OPENJDK9 into {USE,TARGET}_OPENJDK9." 2017-11-17 15:14:40 +00:00
Tobias Thierer f6bd495728 Break EXPERIMENTAL_USE_OPENJDK9 into {USE,TARGET}_OPENJDK9.
This CL topic breaks the single flag value EXPERIMENTAL_USE_OPENJDK9
into two flags USE_OPENJDK9 and TARGET_OPENJDK9 which are computed
independently in config.mk and config.go; this means that later
build logic no longer depends on / duplicates the semantics of an
unset EXPERIMENTAL_USE_OPENJDK9, because that later build logic
can use USE_OPENJDK9 and TARGET_OPENJDK9 instead. Thus, it becomes
slightly easier to change this default in future CLs (touching
only config.mk and config.go).

It also makes it more straightforward to convert .mk files
to .bp.

This CL also introduces a new allowed value "false" for
EXPERIMENTAL_USE_OPENJDK9. This fourth possible value currently
has the same semantics as a default/unset
EXPERIMENTAL_USE_OPENJDK9, but allows people to explicitly
switch back to the old semantics when the default changes.

Test: make showcommands core-oj (in environments with
      EXPERIMENTAL_USE_OPENJDK9 set to "", "1.8", and "true").
Bug: 38177295

Change-Id: Iaade9610b237722e5d175143808b8653b1e98996
2017-11-17 13:14:11 +00:00
Alan Leung fcc1a99442 Merge "Rename r8 to r8-compat-proguard" am: 81eeb78200
am: 4eee474504

Change-Id: I8c345ba17bf7614e64dc31456cb00f51bb248615
2017-11-17 03:18:14 +00:00
Alan Leung 4eee474504 Merge "Rename r8 to r8-compat-proguard"
am: 81eeb78200

Change-Id: Ibe7c114115f627ae3f061f8087b93891af475e40
2017-11-17 03:15:09 +00:00
Treehugger Robot 81eeb78200 Merge "Rename r8 to r8-compat-proguard" 2017-11-17 03:11:29 +00:00
Alan Leung 7d6144d34b Rename r8 to r8-compat-proguard
Test: USE_R8=false USE_D8=true m -j32 && USE_R8=true USE_D8=true m -j32

Change-Id: I2610340cf75f8db5920e33fac542f0dcf294ce29
2017-11-16 17:24:01 -08:00
Chih-Hung Hsieh 2cd467b36c Recognize new clang-tidy android-* warnings.
Test: warn.py build.log
Change-Id: I9bcd1fffcb567346a3d959f98821e2cf58e87ba2
2017-11-16 15:42:11 -08:00
Colin Cross 0bb782bd4e Allow converting logtags to java without merged logtags file
Most logtags files only have entries with hardcoded numbers.
Allow these files to be converted to java without needing the
merged logtags file.

Test: m checkbuild
Change-Id: I4cd38aa502fc9b8e50af92ff8296d3ad6abfb56e
2017-11-16 14:58:05 -08:00
Colin Cross e89df93231 Add support for srcjars to droiddoc
Soong generates the R.java for framework-res.apk to a srcjar.
Droiddoc will need to consume them, so add support to the droiddoc
rules for extracting sources from a srcjar.

Test: m checkbuild
Change-Id: I064889c9063b642835d9f668e2568b61d0fabe35
2017-11-16 14:58:05 -08:00
Tomasz Wasilczyk 1c26bc9b27 Silence yet more superfluous build messages.
Bug: 69315492
Test: it builds
Change-Id: I89fcbf9f6435da7ff1c374020870c989b671af2a
2017-11-16 10:14:27 -08:00
Dan Willemsen 507d6d73aa Merge "Clear some aapt2.mk inputs after use" am: 70964e8024
am: 1684afb6ee

Change-Id: I0a088af07c8a6af49db2c05152701dd36d20b28a
2017-11-16 04:19:15 +00:00
Dan Willemsen 1684afb6ee Merge "Clear some aapt2.mk inputs after use"
am: 70964e8024

Change-Id: I62b9dd3c0a6875fb9b14fe401d3843ae855becf2
2017-11-16 04:17:10 +00:00
Treehugger Robot 70964e8024 Merge "Clear some aapt2.mk inputs after use" 2017-11-16 04:12:25 +00:00
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