OSDN Git Service

android-x86/build.git
7 years agoMerge "Fix GET-INSTALL-PATH to work with Soong" am: 6b9aa6938d
Dan Willemsen [Mon, 15 Aug 2016 21:21:32 +0000 (21:21 +0000)]
Merge "Fix GET-INSTALL-PATH to work with Soong" am: 6b9aa6938d
am: 9fc9cac0ac

Change-Id: I36aa2dcfca3b0a57c83291d1df07afb50bf3dc92

7 years agoMerge "Fix GET-INSTALL-PATH to work with Soong"
Dan Willemsen [Mon, 15 Aug 2016 21:17:33 +0000 (21:17 +0000)]
Merge "Fix GET-INSTALL-PATH to work with Soong"
am: 6b9aa6938d

Change-Id: I9f433cb383846ec6ccb8e39be4b30110d60d54fd

7 years agoMerge "Fix GET-INSTALL-PATH to work with Soong"
Dan Willemsen [Mon, 15 Aug 2016 21:07:53 +0000 (21:07 +0000)]
Merge "Fix GET-INSTALL-PATH to work with Soong"

7 years ago Update security string to 2016-09-07 to platform and CTS for September respin...
Adam Seaton [Fri, 12 Aug 2016 21:28:49 +0000 (21:28 +0000)]
  Update security string to 2016-09-07 to platform and CTS for September   respin am: cc5148493f am: 637fa9c4c5 am: 5ed4043667 am: 48e00645fe am: f63dfac0e3 am: a14e8c2f31 am: d5c59f3b97  -s ours am: cdbdfcdbd5 am: afe698d76e am: 0a3ae2d78d am: b542d46745
am: 30cae665ea

Change-Id: I55cfc39698d8fc30c0e3e00b67e721b3a4e2bd70

7 years ago Update security string to 2016-09-07 to platform and CTS for September respin...
Adam Seaton [Fri, 12 Aug 2016 21:25:17 +0000 (21:25 +0000)]
  Update security string to 2016-09-07 to platform and CTS for September   respin am: cc5148493f am: 637fa9c4c5 am: 5ed4043667 am: 48e00645fe am: f63dfac0e3 am: a14e8c2f31 am: d5c59f3b97  -s ours am: cdbdfcdbd5 am: afe698d76e am: 0a3ae2d78d
am: b542d46745

Change-Id: I030d17ffefee2096df8eaf5b9dce72b86a0bca01

7 years ago Update security string to 2016-09-07 to platform and CTS for September respin...
Adam Seaton [Fri, 12 Aug 2016 21:21:45 +0000 (21:21 +0000)]
  Update security string to 2016-09-07 to platform and CTS for September   respin am: cc5148493f am: 637fa9c4c5 am: 5ed4043667 am: 48e00645fe am: f63dfac0e3 am: a14e8c2f31 am: d5c59f3b97  -s ours am: cdbdfcdbd5 am: afe698d76e
am: 0a3ae2d78d

Change-Id: I6d317744f1269b1760d4c12a734e3377033acbd7

7 years ago Update security string to 2016-09-07 to platform and CTS for September respin...
Adam Seaton [Fri, 12 Aug 2016 21:18:17 +0000 (21:18 +0000)]
  Update security string to 2016-09-07 to platform and CTS for September   respin am: cc5148493f am: 637fa9c4c5 am: 5ed4043667 am: 48e00645fe am: f63dfac0e3 am: a14e8c2f31 am: d5c59f3b97  -s ours am: cdbdfcdbd5
am: afe698d76e

Change-Id: I8b5cc4ff2992ffe0f229a811076b215b7d0ab0af

7 years ago Update security string to 2016-09-07 to platform and CTS for September respin...
Adam Seaton [Fri, 12 Aug 2016 21:14:53 +0000 (21:14 +0000)]
  Update security string to 2016-09-07 to platform and CTS for September   respin am: cc5148493f am: 637fa9c4c5 am: 5ed4043667 am: 48e00645fe am: f63dfac0e3 am: a14e8c2f31 am: d5c59f3b97  -s ours
am: cdbdfcdbd5

Change-Id: Ic0300b3b3018dc08277ddc0398143ae8bcbd0fbc

7 years ago Update security string to 2016-09-07 to platform and CTS for September respin...
Adam Seaton [Fri, 12 Aug 2016 21:10:44 +0000 (21:10 +0000)]
  Update security string to 2016-09-07 to platform and CTS for September   respin am: cc5148493f am: 637fa9c4c5 am: 5ed4043667 am: 48e00645fe am: f63dfac0e3 am: a14e8c2f31
am: d5c59f3b97  -s ours

Change-Id: Ibcf2cb117de238fa76e0551fd97a12d88200e30d

7 years agoMerge "Replace META/care_map.txt when signing target files" am: 7b11cacbba
Tianjie Xu [Fri, 12 Aug 2016 18:10:07 +0000 (18:10 +0000)]
Merge "Replace META/care_map.txt when signing target files" am: 7b11cacbba
am: bf5e3d168d

Change-Id: I6476c710a220e2fe91dd06203ee418665ebd1a37

7 years agoMerge "Replace META/care_map.txt when signing target files"
Tianjie Xu [Fri, 12 Aug 2016 18:06:41 +0000 (18:06 +0000)]
Merge "Replace META/care_map.txt when signing target files"
am: 7b11cacbba

Change-Id: Ia8e888a0f330d00f6518e352356ca480819586db

7 years agoMerge "Replace META/care_map.txt when signing target files"
Tianjie Xu [Fri, 12 Aug 2016 18:01:55 +0000 (18:01 +0000)]
Merge "Replace META/care_map.txt when signing target files"

7 years agoFix GET-INSTALL-PATH to work with Soong
Dan Willemsen [Fri, 12 Aug 2016 00:20:33 +0000 (17:20 -0700)]
Fix GET-INSTALL-PATH to work with Soong

This was printing all of the Soong modules in addition to the modules
defined in the ONE_SHOT_MAKEFILE. So replicate what we did with
MODULES-IN-* with GET-INSTALL-PATH-IN-* and update all the users.

Bug: 30191725
Change-Id: Ib1e4bf00f64d7a3e8cd91f44eaf1ff82fdfbf162

7 years agoReplace META/care_map.txt when signing target files
Tianjie Xu [Fri, 12 Aug 2016 01:04:27 +0000 (18:04 -0700)]
Replace META/care_map.txt when signing target files

Do not copy the "META/care_map.txt" from the source zipfile when
signing the target files with sign_target_files_apks. Because we'll
generate a new care_map after rebuilding the system/vendor images;
and we'll write the new "META/care_map.txt" to the signed-target-file.

Change-Id: I6919cfdf8314a4084b5f612a9c89469f391486a4
Test: Run sign_target_files_apks locally, and the entry is updated.
Bug: 30812253

7 years agoMerge "Fix discrepancy in SANITIZE_TARGET format with soong." am: 0d86fc57cd
Colin Cross [Fri, 12 Aug 2016 00:06:25 +0000 (00:06 +0000)]
Merge "Fix discrepancy in SANITIZE_TARGET format with soong." am: 0d86fc57cd
am: 0216097482

Change-Id: Ia45aaf2ac6e36b3d960d97a65ecccd7ca6da83d3

7 years agoMerge "Fix discrepancy in SANITIZE_TARGET format with soong."
Colin Cross [Fri, 12 Aug 2016 00:04:38 +0000 (00:04 +0000)]
Merge "Fix discrepancy in SANITIZE_TARGET format with soong."
am: 0d86fc57cd

Change-Id: Ib643a2d9682eabd494f40a0d5b7fbaeb42583d30

7 years agoMerge "Fix discrepancy in SANITIZE_TARGET format with soong."
Colin Cross [Thu, 11 Aug 2016 23:53:29 +0000 (23:53 +0000)]
Merge "Fix discrepancy in SANITIZE_TARGET format with soong."

7 years agoUpdate Security String to 2016-09-06 to platform and CTS for September Security ...
Adam Seaton [Thu, 11 Aug 2016 21:55:18 +0000 (21:55 +0000)]
Update Security String to 2016-09-06 to platform and CTS for September Security (+Quadrooter,-PZ) am: fa721839b2 am: fdf4c8d8a6 am: 21b4d9e01c am: 1f85078b1e
am: 782967785e

Change-Id: Ia8cb06a26fc6856a85bbd3d6266eb41034bd600a

7 years agoUpdate Security String to 2016-09-06 to platform and CTS for September Security ...
Adam Seaton [Thu, 11 Aug 2016 21:51:46 +0000 (21:51 +0000)]
Update Security String to 2016-09-06 to platform and CTS for September Security (+Quadrooter,-PZ) am: fa721839b2 am: fdf4c8d8a6 am: 21b4d9e01c
am: 1f85078b1e

Change-Id: Id8709a33bf19fb106341a8aed5f2978adf91a7ef

7 years agoUpdate Security String to 2016-09-06 to platform and CTS for September Security ...
Adam Seaton [Thu, 11 Aug 2016 21:48:46 +0000 (21:48 +0000)]
Update Security String to 2016-09-06 to platform and CTS for September Security (+Quadrooter,-PZ) am: fa721839b2 am: fdf4c8d8a6
am: 21b4d9e01c

Change-Id: I24dd917aef85ca2bb36b310ed97e57fbedac4558

7 years agoUpdate Security String to 2016-09-06 to platform and CTS for September Security ...
Adam Seaton [Thu, 11 Aug 2016 21:45:16 +0000 (21:45 +0000)]
Update Security String to 2016-09-06 to platform and CTS for September Security (+Quadrooter,-PZ) am: fa721839b2
am: fdf4c8d8a6

Change-Id: I5ad798a99ea890bff77c9cd579a72e3794df92e0

7 years agoUpdate Security String to 2016-09-06 to platform and CTS for September Security ...
Adam Seaton [Thu, 11 Aug 2016 21:41:45 +0000 (21:41 +0000)]
Update Security String to 2016-09-06 to platform and CTS for September Security (+Quadrooter,-PZ)
am: fa721839b2

Change-Id: Iff74354f3540185eff4ae1b44600f5d00e1029cd

7 years agoMerge "releasetools: Update the path to /default.prop for A/B devices." am: 6d64ff1bf7
Tao Bao [Thu, 11 Aug 2016 20:45:46 +0000 (20:45 +0000)]
Merge "releasetools: Update the path to /default.prop for A/B devices." am: 6d64ff1bf7
am: 6eb5564025

Change-Id: Icd75b3de56e129cc932445b9ec5a00e0ec8525b6

7 years agoMerge "releasetools: Update the path to /default.prop for A/B devices."
Tao Bao [Thu, 11 Aug 2016 20:42:34 +0000 (20:42 +0000)]
Merge "releasetools: Update the path to /default.prop for A/B devices."
am: 6d64ff1bf7

Change-Id: I1deeff5d22454c1fae5b450dbf2e6a35ffbc6227

7 years agoMerge "releasetools: Update the path to /default.prop for A/B devices."
Tao Bao [Thu, 11 Aug 2016 20:39:31 +0000 (20:39 +0000)]
Merge "releasetools: Update the path to /default.prop for A/B devices."

7 years agoUpdate Security String to 2016-09-06 to platform and CTS for September
Adam Seaton [Thu, 11 Aug 2016 19:39:25 +0000 (12:39 -0700)]
Update Security String to 2016-09-06 to platform and CTS for September
Security (+Quadrooter,-PZ)

Change-Id: I248efb2cbd877b4954994077df0f90adcf332f4a

7 years agoMerge "Use soong_zip and zip2zip to make dist faster" am: 6dcdb45485
Dan Willemsen [Thu, 11 Aug 2016 19:36:44 +0000 (19:36 +0000)]
Merge "Use soong_zip and zip2zip to make dist faster" am: 6dcdb45485
am: 96963dfd4d

Change-Id: I0f19fc1908f84da6f602564d57256423b108bf16

7 years agoMerge "Use soong_zip and zip2zip to make dist faster"
Dan Willemsen [Thu, 11 Aug 2016 19:33:10 +0000 (19:33 +0000)]
Merge "Use soong_zip and zip2zip to make dist faster"
am: 6dcdb45485

Change-Id: I9a4241b436f7dead5de7b02d3af56004b1eed42f

7 years agoMerge "Use soong_zip and zip2zip to make dist faster"
Treehugger Robot [Thu, 11 Aug 2016 19:28:13 +0000 (19:28 +0000)]
Merge "Use soong_zip and zip2zip to make dist faster"

7 years agoreleasetools: Update the path to /default.prop for A/B devices.
Tao Bao [Thu, 11 Aug 2016 18:00:58 +0000 (11:00 -0700)]
releasetools: Update the path to /default.prop for A/B devices.

On A/B devices (i.e. system_root_image="true"), /default.prop is
packaged at ROOT/default.prop (as opposed to BOOT/RAMDISK/default.prop
for non-A/B devices). Update the path so that we handle properties like
ro.bootimage.build.fingerprint properly.

The one for recovery is not affected, which stays at
BOOT/RAMDISK/default.prop for A/B devices and gets updated correctly.

Bug: 30811237
Test: Verify the property in the generated signed-TF.zip.
Change-Id: Id201a042d7ea988a64f89c6d04f43326a9851e27

7 years agoMerge "Add support for NDK r13." am: 287093a98c
Dan Albert [Thu, 11 Aug 2016 16:56:10 +0000 (16:56 +0000)]
Merge "Add support for NDK r13." am: 287093a98c
am: ae49ab2f0f

Change-Id: Ie8530ae07fb60b2dd15d2d88cecf9fad1458a337

7 years agoMerge "Add support for NDK r13."
Dan Albert [Thu, 11 Aug 2016 16:52:52 +0000 (16:52 +0000)]
Merge "Add support for NDK r13."
am: 287093a98c

Change-Id: I8e10422cdd20d3ee0402acabbdbe60a41ba59901

7 years agoMerge "Add support for NDK r13."
Dan Albert [Thu, 11 Aug 2016 16:46:34 +0000 (16:46 +0000)]
Merge "Add support for NDK r13."

7 years agoUse soong_zip and zip2zip to make dist faster
Dan Willemsen [Sun, 7 Aug 2016 03:15:06 +0000 (20:15 -0700)]
Use soong_zip and zip2zip to make dist faster

soong_zip parallelizes the compression when creating a zip file, which
makes these packaging steps far shorter.

zip2zip skips the decompression and recompression during the -img- file
creation.

For an aosp_arm64-eng aosp/master build:

target_files.zip: 92s to 60s
symbols.zip: 147s to 7s
img.zip: 64s to 0.5s

There's still room to parallelize the image compression during
target_files.zip (add_img_to_target_files step takes most of the time)

Change-Id: I7b6a91e4a7dbeda2e49ca936b10181cff2f973d7

7 years agoAdd support for NDK r13.
Dan Albert [Tue, 9 Aug 2016 00:14:59 +0000 (17:14 -0700)]
Add support for NDK r13.

Test: make checkbuild
Change-Id: I4521c768c67771cee9df9e59ed45344c40c48a38

7 years agoMerge changes from topic 'ab_sideload' am: 3750ed3e17
Alex Deymo [Wed, 10 Aug 2016 05:04:23 +0000 (05:04 +0000)]
Merge changes from topic 'ab_sideload' am: 3750ed3e17
am: 93ff77ad1a

Change-Id: Idbe285c05dfb9b4b6252ef87a3066f8a41f13044

7 years agoMerge changes from topic 'ab_sideload'
Alex Deymo [Wed, 10 Aug 2016 05:00:57 +0000 (05:00 +0000)]
Merge changes from topic 'ab_sideload'
am: 3750ed3e17

Change-Id: I4afbecc40068c7a87c7532b22a404319c24e2c05

7 years agoMerge changes from topic 'ab_sideload'
Alex Deymo [Wed, 10 Aug 2016 03:55:24 +0000 (03:55 +0000)]
Merge changes from topic 'ab_sideload'

* changes:
  Replace OTA sideload verification key when signing A/B devices.
  Install the update-payload-key in the recovery image as well.

7 years agoMerge "Account for `LOCAL_NDK_VERSION` when packaging." am: a1374de305
Dan Albert [Tue, 9 Aug 2016 01:42:12 +0000 (01:42 +0000)]
Merge "Account for `LOCAL_NDK_VERSION` when packaging." am: a1374de305
am: 43c41aea18

Change-Id: Ib67b829f3989ba353d4031dca89ba90e792a73ca

7 years agoMerge "Account for `LOCAL_NDK_VERSION` when packaging."
Dan Albert [Tue, 9 Aug 2016 01:39:43 +0000 (01:39 +0000)]
Merge "Account for `LOCAL_NDK_VERSION` when packaging."
am: a1374de305

Change-Id: I37d554e931ef125a888ffc2bdf6e6e2f031d89e1

7 years agoMerge "Account for `LOCAL_NDK_VERSION` when packaging."
Treehugger Robot [Tue, 9 Aug 2016 01:36:23 +0000 (01:36 +0000)]
Merge "Account for `LOCAL_NDK_VERSION` when packaging."

7 years agoAccount for `LOCAL_NDK_VERSION` when packaging.
Dan Albert [Tue, 9 Aug 2016 00:13:31 +0000 (17:13 -0700)]
Account for `LOCAL_NDK_VERSION` when packaging.

Previously an app built with `LOCAL_NDK_VERSION := r10` would still
be packaged with r11's library.

Test: make checkbuild
Change-Id: I1dcbd65057adaa1af605b9770283f7da994fc3cf

7 years agoUpdate Security String to 2016-09-07 to platform and CTS for September respin am...
Adam Seaton [Tue, 9 Aug 2016 00:09:06 +0000 (00:09 +0000)]
Update Security String to 2016-09-07 to platform and CTS for September respin am: a53b868e6e am: e158db8ad2 am: 68870731a5 am: f7de14b8a1
am: 2d033a9e51

Change-Id: If10e5e34fcd4621c0c7b444f557b7c5c99081007

7 years agoUpdate Security String to 2016-09-07 to platform and CTS for September respin am...
Adam Seaton [Tue, 9 Aug 2016 00:05:36 +0000 (00:05 +0000)]
Update Security String to 2016-09-07 to platform and CTS for September respin am: a53b868e6e am: e158db8ad2 am: 68870731a5
am: f7de14b8a1

Change-Id: I1412b8cee615535abe366b43ce4041efb4488bde

7 years ago Update security string to 2016-09-07 to platform and CTS for September respin...
Adam Seaton [Mon, 8 Aug 2016 23:57:10 +0000 (23:57 +0000)]
  Update security string to 2016-09-07 to platform and CTS for September   respin am: cc5148493f am: 637fa9c4c5 am: 5ed4043667 am: 48e00645fe am: f63dfac0e3
am: a14e8c2f31

Change-Id: I471611e0996ab801d105a392fafbb8c1008c3350

7 years agoUpdate Security String to 2016-09-07 to platform and CTS for September respin am...
Adam Seaton [Mon, 8 Aug 2016 23:57:05 +0000 (23:57 +0000)]
Update Security String to 2016-09-07 to platform and CTS for September respin am: a53b868e6e am: e158db8ad2
am: 68870731a5

Change-Id: I3e302e74d090485c179381a085d39d17bc212d67

7 years ago Update security string to 2016-09-07 to platform and CTS for September respin...
Adam Seaton [Mon, 8 Aug 2016 23:54:06 +0000 (23:54 +0000)]
  Update security string to 2016-09-07 to platform and CTS for September   respin am: cc5148493f am: 637fa9c4c5 am: 5ed4043667 am: 48e00645fe
am: f63dfac0e3

Change-Id: I02999f460037cf8b6353c7be86c58459e8226efc

7 years agoUpdate Security String to 2016-09-07 to platform and CTS for September respin am...
Adam Seaton [Mon, 8 Aug 2016 23:54:05 +0000 (23:54 +0000)]
Update Security String to 2016-09-07 to platform and CTS for September respin am: a53b868e6e
am: e158db8ad2

Change-Id: I61ddf7619069a6dc3bb10a70c6eca4d55a33c3fe

7 years ago Update security string to 2016-09-07 to platform and CTS for September respin...
Adam Seaton [Mon, 8 Aug 2016 23:51:35 +0000 (23:51 +0000)]
  Update security string to 2016-09-07 to platform and CTS for September   respin am: cc5148493f am: 637fa9c4c5 am: 5ed4043667
am: 48e00645fe

Change-Id: I284881c64f9370598434871634a7fc7794bc6581

7 years agoUpdate Security String to 2016-09-07 to platform and CTS for September respin
Adam Seaton [Mon, 8 Aug 2016 23:48:10 +0000 (23:48 +0000)]
Update Security String to 2016-09-07 to platform and CTS for September respin
am: a53b868e6e

Change-Id: I0655a62b517357f75022f902d26b44a5c8aeaf85

7 years ago Update security string to 2016-09-07 to platform and CTS for September respin...
Adam Seaton [Mon, 8 Aug 2016 23:48:05 +0000 (23:48 +0000)]
  Update security string to 2016-09-07 to platform and CTS for September   respin am: cc5148493f am: 637fa9c4c5
am: 5ed4043667

Change-Id: I14818a4b4220874c816fbe9dc1d150b598f030e5

7 years ago Update security string to 2016-09-07 to platform and CTS for September respin...
Adam Seaton [Mon, 8 Aug 2016 23:45:04 +0000 (23:45 +0000)]
  Update security string to 2016-09-07 to platform and CTS for September   respin am: cc5148493f
am: 637fa9c4c5

Change-Id: I8f5459266c69eddf11101f9be3a46beecdc71dad

7 years ago Update security string to 2016-09-07 to platform and CTS for September respin
Adam Seaton [Mon, 8 Aug 2016 23:42:34 +0000 (23:42 +0000)]
  Update security string to 2016-09-07 to platform and CTS for September   respin
am: cc5148493f

Change-Id: Ib5a5e433d0a94040a4261dae9555606c34d18e81

7 years agoMerge "Simplify DEFAULT_LOCAL_TIDY_CHECKS." am: 4d9d191ee7
Chih-hung Hsieh [Mon, 8 Aug 2016 23:40:05 +0000 (23:40 +0000)]
Merge "Simplify DEFAULT_LOCAL_TIDY_CHECKS." am: 4d9d191ee7
am: e79eae70f4

Change-Id: I0a9444855d9ec00fba919d9812a373a3f468d23a

7 years agoMerge "Simplify DEFAULT_LOCAL_TIDY_CHECKS."
Chih-hung Hsieh [Mon, 8 Aug 2016 23:37:35 +0000 (23:37 +0000)]
Merge "Simplify DEFAULT_LOCAL_TIDY_CHECKS."
am: 4d9d191ee7

Change-Id: I28ec175909e7993f84089846c7c25f516aa1bf02

7 years agoMerge "Simplify DEFAULT_LOCAL_TIDY_CHECKS."
Chih-hung Hsieh [Mon, 8 Aug 2016 23:22:13 +0000 (23:22 +0000)]
Merge "Simplify DEFAULT_LOCAL_TIDY_CHECKS."

7 years agoUpdate Security String to 2016-09-07 to platform and CTS for September
Adam Seaton [Mon, 8 Aug 2016 22:08:45 +0000 (15:08 -0700)]
Update Security String to 2016-09-07 to platform and CTS for September
respin

Change-Id: I6ec8efad5b8e45bcf9df79fb54824acc92755a3b

7 years agoSimplify DEFAULT_LOCAL_TIDY_CHECKS.
Chih-Hung Hsieh [Mon, 8 Aug 2016 22:01:59 +0000 (15:01 -0700)]
Simplify DEFAULT_LOCAL_TIDY_CHECKS.

* Now each local directory path is matched against multiple
  patterns and only the last matched one will be used,
  or the DEFAULT_GLOBAL_TIDY_CHECKS is used.

Bug: http://b/27779618
Change-Id: I786e6cacd8a680a034b4bc09f561f658177d9b17
Test: build with WITH_TIDY=1.

7 years ago Update security string to 2016-09-07 to platform and CTS for September
Adam Seaton [Mon, 8 Aug 2016 21:59:46 +0000 (14:59 -0700)]
  Update security string to 2016-09-07 to platform and CTS for September
  respin

Change-Id: I0f753925387a19fa055efd08ce026ef98431ef03

8 years agoMerge "core: Makefile: fix a typo in a comment" am: 80ad0df403
Alex Naidis [Sun, 7 Aug 2016 16:10:02 +0000 (16:10 +0000)]
Merge "core: Makefile: fix a typo in a comment" am: 80ad0df403
am: 7fa7758bd3

Change-Id: I08f50d119ae161d762a16b0dd67b7a2741096b56

8 years agoMerge "core: Makefile: fix a typo in a comment"
Alex Naidis [Sun, 7 Aug 2016 16:06:35 +0000 (16:06 +0000)]
Merge "core: Makefile: fix a typo in a comment"
am: 80ad0df403

Change-Id: Id0fce6adadada6d80cca5b08b1e61f0e7a88a01c

8 years agoMerge "core: Makefile: fix a typo in a comment"
Treehugger Robot [Sun, 7 Aug 2016 16:01:06 +0000 (16:01 +0000)]
Merge "core: Makefile: fix a typo in a comment"

8 years agocore: Makefile: fix a typo in a comment
Alex Naidis [Sun, 10 Jan 2016 14:18:54 +0000 (14:18 +0000)]
core: Makefile: fix a typo in a comment

Change-Id: I1a8f1a4e2d7d29fa930fd0a07f4885c162f3e1f4
Signed-off-by: Alex Naidis <alex.naidis@linux.com>
8 years agoMerge "Define __ANDROID_API__ when building for the NDK." am: 30fe7576d0
Dan Albert [Sat, 6 Aug 2016 01:21:56 +0000 (01:21 +0000)]
Merge "Define __ANDROID_API__ when building for the NDK." am: 30fe7576d0
am: aede8d4912

Change-Id: I26eec6e4cac0a30cb3184e3b1ea3893715950cae

8 years agoMerge "Define __ANDROID_API__ when building for the NDK."
Dan Albert [Sat, 6 Aug 2016 01:18:58 +0000 (01:18 +0000)]
Merge "Define __ANDROID_API__ when building for the NDK."
am: 30fe7576d0

Change-Id: I4aa349b7293db5e9e7214cdb10a682164214de60

8 years agoMerge "Define __ANDROID_API__ when building for the NDK."
Treehugger Robot [Sat, 6 Aug 2016 00:52:33 +0000 (00:52 +0000)]
Merge "Define __ANDROID_API__ when building for the NDK."

8 years agoDefine __ANDROID_API__ when building for the NDK.
Dan Albert [Fri, 5 Aug 2016 23:34:40 +0000 (16:34 -0700)]
Define __ANDROID_API__ when building for the NDK.

Traditionally this has come from android/api-level.h, but with the
libc headers unified it must be set by the build system since we don't
have per-API level copies of that header now.

Test: make checkbuild with other libc ndk_library patches
Change-Id: Idf6cbba131f065b048b1b412e992c55e3d17e701

8 years agoMerge "More NDK generated libs support." am: bd9fb4ba01
Dan Albert [Fri, 5 Aug 2016 22:38:18 +0000 (22:38 +0000)]
Merge "More NDK generated libs support." am: bd9fb4ba01
am: db4c597d5f

Change-Id: Icaef258ae8c69609845a2347d6963d09275a1a45

8 years agoMerge "Make it an error when LOCAL_CLANG is false." am: 9204b776bb
Chih-hung Hsieh [Fri, 5 Aug 2016 22:38:18 +0000 (22:38 +0000)]
Merge "Make it an error when LOCAL_CLANG is false." am: 9204b776bb
am: f329021c0f

Change-Id: Ie0ea0c0ce8125724cf5c0b4fcf8ec2147d7777e9

8 years agoMerge "More NDK generated libs support."
Dan Albert [Fri, 5 Aug 2016 22:35:11 +0000 (22:35 +0000)]
Merge "More NDK generated libs support."
am: bd9fb4ba01

Change-Id: I46e77781702a68bea56691245e04387fc2845b56

8 years agoMerge "Make it an error when LOCAL_CLANG is false."
Chih-Hung Hsieh [Fri, 5 Aug 2016 22:35:10 +0000 (22:35 +0000)]
Merge "Make it an error when LOCAL_CLANG is false."
am: 9204b776bb

Change-Id: I7e2e674eb6f79ec7180f801dd12378842b239512

8 years agoMerge "More NDK generated libs support."
Treehugger Robot [Fri, 5 Aug 2016 22:32:12 +0000 (22:32 +0000)]
Merge "More NDK generated libs support."

8 years agoMerge "Make it an error when LOCAL_CLANG is false."
Chih-hung Hsieh [Fri, 5 Aug 2016 22:25:43 +0000 (22:25 +0000)]
Merge "Make it an error when LOCAL_CLANG is false."

8 years agoMake it an error when LOCAL_CLANG is false.
Chih-Hung Hsieh [Thu, 4 Aug 2016 22:35:51 +0000 (15:35 -0700)]
Make it an error when LOCAL_CLANG is false.

Only projects in LOCAL_CLANG_EXCEPTION_PROJECTS can set LOCAL_CLANG to false.
Add external/gentoo/integration to this white list.

Bug: 30575506
Change-Id: Icd508686bc2eb8b9d400200166df80115af20da1
Test: build and find new warning in build.log

8 years agoReplace OTA sideload verification key when signing A/B devices.
Alex Deymo [Thu, 4 Aug 2016 23:06:12 +0000 (16:06 -0700)]
Replace OTA sideload verification key when signing A/B devices.

The update-payload-key is used by update_engine_sideload from recovery
to verify an update payload.

Bug: 27178350
Change-Id: I7a0a307ae565e5e9cbf2c9b58fbcc055e87771ce

8 years agoMore NDK generated libs support.
Dan Albert [Thu, 4 Aug 2016 21:14:50 +0000 (14:14 -0700)]
More NDK generated libs support.

Any NDK shared libraries not in LOCAL_SYSTEM_SHARED_LIBRARIES weren't
being pulled from the generated libs before since we were only
filtering my_system_shared_libraries and even if we had filtered
my_shared_libraries they would have been rewritten to my_ldlibs.

* Filter my_shared_libraries for NDK generated libs as well.
* Stop rewriting NDK LOCAL_SHARED_LIBRARIES to my_ldlibs. Instead,
  rewrite in the opposite direction just like we do for the platform.
* Move shared libs/ldlibs rewriting to before we filter NDK
  libraries out of shared libs/system shared libs.

Test: make checkbuild
Bug: http://b/27533932
Change-Id: If1860d9638de77089a46884f406766edaf362216

8 years agoInstall the update-payload-key in the recovery image as well.
Alex Deymo [Thu, 4 Aug 2016 03:52:54 +0000 (20:52 -0700)]
Install the update-payload-key in the recovery image as well.

The update-payload-key is required to verify the contents of the OTA in
recovery while sideloading an update.

Bug: 27178350
TEST=`make` builds a boot.img with the payload key in recovery.

Change-Id: I04616979023b84aa4a1feb6916db2b2725b25c54

8 years agodocs: Add TOC template logic for ARC docs am: accb6660a5
Joe Fernandez [Thu, 4 Aug 2016 00:54:40 +0000 (00:54 +0000)]
docs: Add TOC template logic for ARC docs am: accb6660a5
am: 9d606e0082

Change-Id: Ie73c8f38a93bd7658264ae7811a3c77792fe3632

8 years agodocs: Add TOC template logic for ARC docs
Joe Fernandez [Thu, 4 Aug 2016 00:51:04 +0000 (00:51 +0000)]
docs: Add TOC template logic for ARC docs
am: accb6660a5

Change-Id: I58282b1958be93e2247f873a9e8b13d0e192b56a

8 years agodocs: Add TOC template logic for ARC docs
Joe Fernandez [Tue, 2 Aug 2016 00:15:14 +0000 (17:15 -0700)]
docs: Add TOC template logic for ARC docs

b/30114799

Change-Id: If36c3f9d46bf916b56b2884446451d423565606c
(cherry picked from commit 99aacfe83476f3806d4b9b86ad61670844141bc1)

8 years agoMerge "Allow late binding of LOCAL_CLANG_EXCEPTION_PROJECTS." am: 6b5e8f0037
Chih-Hung Hsieh [Wed, 3 Aug 2016 20:26:46 +0000 (20:26 +0000)]
Merge "Allow late binding of LOCAL_CLANG_EXCEPTION_PROJECTS." am: 6b5e8f0037
am: 90617b5946

Change-Id: Ibca19680de7dafc211c20aae6f485a82cbe321b2

8 years agoMerge "Allow late binding of LOCAL_CLANG_EXCEPTION_PROJECTS."
Chih-Hung Hsieh [Wed, 3 Aug 2016 20:24:22 +0000 (20:24 +0000)]
Merge "Allow late binding of LOCAL_CLANG_EXCEPTION_PROJECTS."
am: 6b5e8f0037

Change-Id: I0b2e7ca9d6aa1feeb5c4edadc565e0bca292625d

8 years agoMerge "Allow late binding of LOCAL_CLANG_EXCEPTION_PROJECTS."
Treehugger Robot [Wed, 3 Aug 2016 20:04:20 +0000 (20:04 +0000)]
Merge "Allow late binding of LOCAL_CLANG_EXCEPTION_PROJECTS."

8 years agoMerge "Allow some bionic tests to compile with gcc." am: 85e94f076c
Chih-Hung Hsieh [Wed, 3 Aug 2016 19:04:40 +0000 (19:04 +0000)]
Merge "Allow some bionic tests to compile with gcc." am: 85e94f076c
am: 00ec6d81fd

Change-Id: I1392a559ac1d035e293239cfa3c49e22f5cead40

8 years agoMerge "Allow some bionic tests to compile with gcc."
Chih-Hung Hsieh [Wed, 3 Aug 2016 19:02:16 +0000 (19:02 +0000)]
Merge "Allow some bionic tests to compile with gcc."
am: 85e94f076c

Change-Id: Ic272be5c1ac460d5bda8373b8790829b43ef8257

8 years agoAllow late binding of LOCAL_CLANG_EXCEPTION_PROJECTS.
Chih-Hung Hsieh [Wed, 3 Aug 2016 18:39:02 +0000 (11:39 -0700)]
Allow late binding of LOCAL_CLANG_EXCEPTION_PROJECTS.

* INTERNAL_LOCAL_CLANG_EXCEPTION_PROJECTS is defined later in other config.mk.
Bug: 30575506
Test: build and find new warning in build.log

Change-Id: If5341a856d1792add38c80a15b8deae39f156138

8 years agoMerge "Allow some bionic tests to compile with gcc."
Treehugger Robot [Wed, 3 Aug 2016 18:55:16 +0000 (18:55 +0000)]
Merge "Allow some bionic tests to compile with gcc."

8 years agoAllow some bionic tests to compile with gcc.
Chih-Hung Hsieh [Wed, 3 Aug 2016 17:42:10 +0000 (10:42 -0700)]
Allow some bionic tests to compile with gcc.

bionic/tests has some test cases compiled with both gcc and clang.

Bug: 30575506
Change-Id: I68576a931021089ecc6b9c9d14ef0b3e3cf05e2d
Test: build and find new warning in build.log

8 years agoMerge "Issue warning on projects with LOCAL_CLANG set to false." am: e71cdfbdee
Chih-hung Hsieh [Wed, 3 Aug 2016 16:53:20 +0000 (16:53 +0000)]
Merge "Issue warning on projects with LOCAL_CLANG set to false." am: e71cdfbdee
am: f43279a359

Change-Id: I0d42d2f4fcc87303064ad4b7026f46573eb31efe

8 years agoMerge "Issue warning on projects with LOCAL_CLANG set to false."
Chih-Hung Hsieh [Wed, 3 Aug 2016 16:50:52 +0000 (16:50 +0000)]
Merge "Issue warning on projects with LOCAL_CLANG set to false."
am: e71cdfbdee

Change-Id: Icb5708eb58f3c8e54b60538377b6afba5eb04de5

8 years agoMerge "Issue warning on projects with LOCAL_CLANG set to false."
Chih-hung Hsieh [Wed, 3 Aug 2016 16:42:26 +0000 (16:42 +0000)]
Merge "Issue warning on projects with LOCAL_CLANG set to false."

8 years agoIssue warning on projects with LOCAL_CLANG set to false.
Chih-Hung Hsieh [Tue, 2 Aug 2016 21:22:06 +0000 (14:22 -0700)]
Issue warning on projects with LOCAL_CLANG set to false.

* LOCAL_CLANG_EXCEPTION_PROJECTS is the list of project prefixes.
* New warning message is detected by warn.py as high severity.

Bug: 30575506
Change-Id: I87a38b2ba6bab1d2e5e7a9d5ec9557f0e609727c
Test: build and find new warning in build.log

8 years agoMerge "introduce AUX build class of targets" am: 556526bf95
Alexey Polyudov [Tue, 2 Aug 2016 22:52:49 +0000 (22:52 +0000)]
Merge "introduce AUX build class of targets" am: 556526bf95
am: 755391d77e

Change-Id: Ib89db8465bd6e38ac3d0b7aa3a24e969e8a9c76c

8 years agoMerge "introduce AUX build class of targets"
Alexey Polyudov [Tue, 2 Aug 2016 22:50:21 +0000 (22:50 +0000)]
Merge "introduce AUX build class of targets"
am: 556526bf95

Change-Id: I52b4b3a561ceb9c1fbe71ce75a4ef4aa252a9665

8 years agoMerge "introduce AUX build class of targets"
Alexey Polyudov [Tue, 2 Aug 2016 22:37:02 +0000 (22:37 +0000)]
Merge "introduce AUX build class of targets"

8 years agoMerge "report correct build target class" am: 974f750661
Alexey Polyudov [Tue, 2 Aug 2016 22:20:00 +0000 (22:20 +0000)]
Merge "report correct build target class" am: 974f750661
am: 3a08a9c079

Change-Id: I987aacec689e1aefc650163aa7fce309253e386c

8 years agoMerge "Make linking with libcompiler_rt conditional" am: 340c0c5701
Alexey Polyudov [Tue, 2 Aug 2016 22:19:59 +0000 (22:19 +0000)]
Merge "Make linking with libcompiler_rt conditional" am: 340c0c5701
am: 74e4a83d47

Change-Id: I03633ef4d5bae7c117ef133e40cf4c0ce57d088b

8 years agoMerge "Do not assume CLANG is used when custom toolchain is provided" am: 7a16eb05cc
Alexey Polyudov [Tue, 2 Aug 2016 22:19:56 +0000 (22:19 +0000)]
Merge "Do not assume CLANG is used when custom toolchain is provided" am: 7a16eb05cc
am: ae817d47dd

Change-Id: I43f11a9755a96394343a54f5ff8ef51cc16e0192

8 years agoMerge "Add LOCAL_NO_PIC to disable position-independent code" am: ce5900a6e0
Alexey Polyudov [Tue, 2 Aug 2016 22:19:54 +0000 (22:19 +0000)]
Merge "Add LOCAL_NO_PIC to disable position-independent code" am: ce5900a6e0
am: 1eba5a69eb

Change-Id: Ie385a2eb668137e51ba17ecdaa44a1518dea2638

8 years agoMerge "report correct build target class"
Alexey Polyudov [Tue, 2 Aug 2016 22:17:26 +0000 (22:17 +0000)]
Merge "report correct build target class"
am: 974f750661

Change-Id: Idad227e2ac7e5b871d2831d6ca17933129e4ce4f