OSDN Git Service

android-x86/build.git
8 years agoDO NOT MERGE Strip path from verity_signer_cmd in the target-files meta data. am...
Claes Elgemark [Thu, 21 Jul 2016 15:27:56 +0000 (15:27 +0000)]
DO NOT MERGE Strip path from verity_signer_cmd in the target-files meta data. am: 687c266053 am: 160e0054dd am: 96e784eb4a  -s ours
am: f8f74bafd2

Change-Id: I0e175fe236eae814e5f67fa55a6bdea7b78cd2a5

8 years agoDO NOT MERGE Strip path from verity_signer_cmd in the target-files meta data. am...
Claes Elgemark [Thu, 21 Jul 2016 15:20:59 +0000 (15:20 +0000)]
DO NOT MERGE Strip path from verity_signer_cmd in the target-files meta data. am: 687c266053 am: 160e0054dd
am: 96e784eb4a  -s ours

Change-Id: I95310c02d97efd4331e0cb0f759ec26b8b403edb

8 years agoMerge \\"Recognize new clang and clang-tidy warnings.\\" am: 6131119708
Chih-Hung Hsieh [Wed, 20 Jul 2016 23:11:07 +0000 (23:11 +0000)]
Merge \\"Recognize new clang and clang-tidy warnings.\\" am: 6131119708
am: bdcc181588

Change-Id: I38ded1b02d69b98e7d519cf7c382e7f227c32ba5

8 years agoMerge \"Recognize new clang and clang-tidy warnings.\"
Chih-Hung Hsieh [Wed, 20 Jul 2016 23:08:36 +0000 (23:08 +0000)]
Merge \"Recognize new clang and clang-tidy warnings.\"
am: 6131119708

Change-Id: If307f868da5d961ad3c1cac371ca3e5a42a6b652

8 years agoMerge "Recognize new clang and clang-tidy warnings."
Treehugger Robot [Wed, 20 Jul 2016 22:57:29 +0000 (22:57 +0000)]
Merge "Recognize new clang and clang-tidy warnings."

8 years agoRecognize new clang and clang-tidy warnings.
Chih-Hung Hsieh [Wed, 20 Jul 2016 17:08:51 +0000 (10:08 -0700)]
Recognize new clang and clang-tidy warnings.

* Count new clang-tidy warnings:
    google-runtime-references
    google-runtime-operator
* Count new clang warnings:
    -Wconst-conversion similar to -Wliteral-conversion
    -Wundefined-var-template
* Modified static analyzer warning message about
    "Null passed to a callee that requires a non-null ..."
* Disable google-runtime-references by default and
  disable misc-macro-parentheses in vendor projects;
  too many old C/C++ code have this warning.

Change-Id: Ib35e0af85875aada17c92b0237b76cd5ae3bfcc8
Test: build with clang-tidy.

8 years agoMerge \\"Factor out common include directories into helper\\" am: 95fa32b577
Colin Cross [Wed, 20 Jul 2016 21:27:04 +0000 (21:27 +0000)]
Merge \\"Factor out common include directories into helper\\" am: 95fa32b577
am: 17904fabbf

Change-Id: I3236f73dc98720778979352258e91d39a5d05b2f

8 years agoMerge \"Factor out common include directories into helper\"
Colin Cross [Wed, 20 Jul 2016 21:24:29 +0000 (21:24 +0000)]
Merge \"Factor out common include directories into helper\"
am: 95fa32b577

Change-Id: I720d7c02de3d11b4a5a3328946433aa7274f1bb6

8 years agoMerge "Factor out common include directories into helper"
Treehugger Robot [Wed, 20 Jul 2016 21:11:22 +0000 (21:11 +0000)]
Merge "Factor out common include directories into helper"

8 years agoDO NOT MERGE Strip path from verity_signer_cmd in the target-files meta data. am...
Claes Elgemark [Wed, 20 Jul 2016 17:47:41 +0000 (17:47 +0000)]
DO NOT MERGE Strip path from verity_signer_cmd in the target-files meta data. am: 687c266053
am: 160e0054dd

Change-Id: I9851d5d1fc397191a35b6ab85cdf66b5bd222ff7

8 years agoDO NOT MERGE Strip path from verity_signer_cmd in the target-files meta data.
Claes Elgemark [Wed, 20 Jul 2016 17:44:42 +0000 (17:44 +0000)]
DO NOT MERGE Strip path from verity_signer_cmd in the target-files meta data.
am: 687c266053

Change-Id: I5531a0fa456311f2a4824c7a9cdb5e3f43461da0

8 years agoDO NOT MERGE Strip path from verity_signer_cmd in the target-files meta data.
Claes Elgemark [Tue, 2 Jun 2015 09:03:27 +0000 (11:03 +0200)]
DO NOT MERGE Strip path from verity_signer_cmd in the target-files meta data.

Strip path to be able to use outside a build e.g.
when resigning using the dist tools zip.

Bug: 30222185
Bug: 30249120
Change-Id: I492dcfd5791b66c17ae2e751cc8f67127e97b800
(cherry picked from commit ec99604b07132358b92bb053777b4db6a0ae0223)

8 years agoMerge \\"Remove GOMA_HERMETIC form goma.mk\\" am: 14df2ef4d0
Fang Deng [Wed, 20 Jul 2016 00:18:39 +0000 (00:18 +0000)]
Merge \\"Remove GOMA_HERMETIC form goma.mk\\" am: 14df2ef4d0
am: 9331f1c8ef

Change-Id: Ia69ef94d6981c030bb5780e51102e3c1dc7ec887

8 years agoMerge \\"Switch to prebuilt clang-3016494\\" am: b1beb6f274
Stephen Hines [Wed, 20 Jul 2016 00:17:53 +0000 (00:17 +0000)]
Merge \\"Switch to prebuilt clang-3016494\\" am: b1beb6f274
am: 8a39030c50

Change-Id: Ibac6df058275e7417210067115e8c06e4591042b

8 years agoMerge \\"Disable warnings triggered in Clang r271374\\" am: 11e0e36462
Stephen Hines [Tue, 19 Jul 2016 23:51:07 +0000 (23:51 +0000)]
Merge \\"Disable warnings triggered in Clang r271374\\" am: 11e0e36462
am: adac150e40

Change-Id: Ied225ef3aa9fc5b390fcdd787112d365c4c38e4d

8 years agoMerge \"Remove GOMA_HERMETIC form goma.mk\"
Fang Deng [Tue, 19 Jul 2016 23:41:57 +0000 (23:41 +0000)]
Merge \"Remove GOMA_HERMETIC form goma.mk\"
am: 14df2ef4d0

Change-Id: Ie9612d77fd35fb25aaad6db1b8c690b139cc1764

8 years agoMerge \"Switch to prebuilt clang-3016494\"
Pirama Arumuga Nainar [Tue, 19 Jul 2016 23:40:37 +0000 (23:40 +0000)]
Merge \"Switch to prebuilt clang-3016494\"
am: b1beb6f274

Change-Id: Ic0cc4734481cddb87ed8c21d2079ab0645dbcc82

8 years agoMerge \"Disable warnings triggered in Clang r271374\"
Pirama Arumuga Nainar [Tue, 19 Jul 2016 23:40:23 +0000 (23:40 +0000)]
Merge \"Disable warnings triggered in Clang r271374\"
am: 11e0e36462

Change-Id: I315936308c883352a195dc4aff0b9f42757019f1

8 years agoMerge "Remove GOMA_HERMETIC form goma.mk"
Fang Deng [Tue, 19 Jul 2016 23:32:37 +0000 (23:32 +0000)]
Merge "Remove GOMA_HERMETIC form goma.mk"

8 years agoFactor out common include directories into helper
Colin Cross [Tue, 19 Jul 2016 20:19:21 +0000 (13:19 -0700)]
Factor out common include directories into helper

Refactor includes in transform-*-to-o to simplify future changes to the
default include paths.

Test: whitespace-only changes to the compile rules in build.ninja
Change-Id: I766af1f22a4838d933691b6df37530db3ba4e21d

8 years agoMerge "Switch to prebuilt clang-3016494"
Stephen Hines [Tue, 19 Jul 2016 22:02:31 +0000 (22:02 +0000)]
Merge "Switch to prebuilt clang-3016494"

8 years agoMerge "Disable warnings triggered in Clang r271374"
Stephen Hines [Tue, 19 Jul 2016 22:02:31 +0000 (22:02 +0000)]
Merge "Disable warnings triggered in Clang r271374"

8 years agoRemove GOMA_HERMETIC form goma.mk
Fang Deng [Tue, 19 Jul 2016 01:33:04 +0000 (01:33 +0000)]
Remove GOMA_HERMETIC form goma.mk

This CL removes the GOMA_HERMETIC setting from goma.mk so that
the default setting will be used. By default, GOMA will fallback
to local compiler if the exactly matched compiler is not available.

Change-Id: I22c83594f6bd30bc8ed1334ab7bb256ef218567b

8 years agoDisable warnings triggered in Clang r271374
Pirama Arumuga Nainar [Tue, 28 Jun 2016 17:54:33 +0000 (10:54 -0700)]
Disable warnings triggered in Clang r271374

http://b/28149048
http://b/29823425

Disable -Wnull-dereference.  The second bug above tracks that this
warning gets re-enabled.

Test: Tested build, boot and common usage for Arm, Arm64, x86, x86_64,
Mips images in AOSP and internal branch.

Change-Id: Ie41a495dd9bb247d3609f4848d7669d1faaeeb79

8 years agoSwitch to prebuilt clang-3016494
Pirama Arumuga Nainar [Tue, 28 Jun 2016 17:58:39 +0000 (10:58 -0700)]
Switch to prebuilt clang-3016494

Test: Tested build, boot and common usage for Arm, Arm64, x86, x86_64,
Mips images in AOSP and internal branch.

Bug: http://b/29823425
Change-Id: I97299c8b41ff9d3ac7019a349aa569609a099233

8 years agoMerge \\"Avoid matching the same warning line twice.\\" am: 0cbba3df2a
Chih-Hung Hsieh [Mon, 18 Jul 2016 23:40:22 +0000 (23:40 +0000)]
Merge \\"Avoid matching the same warning line twice.\\" am: 0cbba3df2a
am: 472589e1cb

Change-Id: I81b387ec3e2892f7f6854482050dc65adf0c277f

8 years agoMerge \"Avoid matching the same warning line twice.\"
Chih-Hung Hsieh [Mon, 18 Jul 2016 23:38:24 +0000 (23:38 +0000)]
Merge \"Avoid matching the same warning line twice.\"
am: 0cbba3df2a

Change-Id: I641fa895ac7033056833107bf062015987965632

8 years agoMerge "Avoid matching the same warning line twice."
Treehugger Robot [Mon, 18 Jul 2016 23:18:47 +0000 (23:18 +0000)]
Merge "Avoid matching the same warning line twice."

8 years agoAvoid matching the same warning line twice.
Chih-Hung Hsieh [Mon, 18 Jul 2016 22:27:02 +0000 (15:27 -0700)]
Avoid matching the same warning line twice.

Used to skip only immediately followed identical warning lines.
Now classifywarning is called only once for each unique warning line.

Change-Id: Ie3b77ded70b41dafad91c042dbe15ad2be119e62
Test: run through build.log file

8 years agoMerge \\"Rename libevent-host to libevent\\" am: 575a023039
Dan Willemsen [Mon, 18 Jul 2016 19:30:17 +0000 (19:30 +0000)]
Merge \\"Rename libevent-host to libevent\\" am: 575a023039
am: 6d1049454d

Change-Id: Ibf611f5317b4d7fd59ba1d8150449df2d30371f8

8 years agoMerge \"Rename libevent-host to libevent\"
Dan Willemsen [Mon, 18 Jul 2016 19:26:18 +0000 (19:26 +0000)]
Merge \"Rename libevent-host to libevent\"
am: 575a023039

Change-Id: Ia98511562db8071258101d38f83f4083db966357

8 years agoMerge "Rename libevent-host to libevent"
Dan Willemsen [Mon, 18 Jul 2016 19:18:32 +0000 (19:18 +0000)]
Merge "Rename libevent-host to libevent"

8 years agoMerge \\"Only add linker_asan as dependency to shared executables\\" am: 458c0cd37b
Colin Cross [Sun, 17 Jul 2016 23:47:59 +0000 (23:47 +0000)]
Merge \\"Only add linker_asan as dependency to shared executables\\" am: 458c0cd37b
am: 3721f184f2

Change-Id: Ia031bb4f71fb6486c184e401f1b2798b41a1ce65

8 years agoMerge \"Only add linker_asan as dependency to shared executables\"
Colin Cross [Sun, 17 Jul 2016 23:45:02 +0000 (23:45 +0000)]
Merge \"Only add linker_asan as dependency to shared executables\"
am: 458c0cd37b

Change-Id: I4c50d21b480200588d4581662d9fda86bb18ee3b

8 years agoMerge "Only add linker_asan as dependency to shared executables"
Colin Cross [Sun, 17 Jul 2016 23:38:39 +0000 (23:38 +0000)]
Merge "Only add linker_asan as dependency to shared executables"

8 years agoOnly add linker_asan as dependency to shared executables
Colin Cross [Sun, 17 Jul 2016 22:28:07 +0000 (15:28 -0700)]
Only add linker_asan as dependency to shared executables

linker_asan is only needed by shared exectuables, prevent adding it as a
dependency of anything else.  Avoids a dependency loop from
linker_asan -> linker -> linker_asan.

Change-Id: Id7744ad8a5901468518fac80741c75e764adb559

8 years agoresolve merge conflicts of 1e92cfb to stage-aosp-master
Colin Cross [Fri, 15 Jul 2016 22:29:05 +0000 (22:29 +0000)]
resolve merge conflicts of 1e92cfb to stage-aosp-master
am: 4cca8a5573

Change-Id: Id1ad45b85e8a06a0a1652d5ce3c8bbdaab5234da

8 years agoresolve merge conflicts of 1e92cfb to stage-aosp-master
Colin Cross [Fri, 15 Jul 2016 21:49:45 +0000 (14:49 -0700)]
resolve merge conflicts of 1e92cfb to stage-aosp-master

Change-Id: I1929d5c16ea0b8574372049ac7dffd30fd3e1db3

8 years agoMerge "Add support for LOCAL_MODULE_SYMLINKS"
Treehugger Robot [Fri, 15 Jul 2016 21:34:33 +0000 (21:34 +0000)]
Merge "Add support for LOCAL_MODULE_SYMLINKS"

8 years agoAdd support for LOCAL_MODULE_SYMLINKS
Colin Cross [Thu, 14 Jul 2016 23:02:57 +0000 (16:02 -0700)]
Add support for LOCAL_MODULE_SYMLINKS

Specifying LOCAL_MODULE_SYMLINKS will create symlinks to the installed
module in the same directory.

Change-Id: Idecb2b75f0c9999eb000eed9a79a989244ccf6c2

8 years agoMerge \\"Add build variant to kernel command line\\" am: 70a9714625
Badhri Jagan Sridharan [Fri, 15 Jul 2016 17:13:08 +0000 (17:13 +0000)]
Merge \\"Add build variant to kernel command line\\" am: 70a9714625
am: 59c0529d6d

Change-Id: I877147d63980b5cc43278c8601e55acf0b794ed5

8 years agoMerge \"Add build variant to kernel command line\"
Badhri Jagan Sridharan [Fri, 15 Jul 2016 17:10:40 +0000 (17:10 +0000)]
Merge \"Add build variant to kernel command line\"
am: 70a9714625

Change-Id: I5e10a5375f50e9562af73407212fd4a800884b20

8 years agoMerge "Add build variant to kernel command line"
Badhri Jagan Sridharan [Fri, 15 Jul 2016 17:00:13 +0000 (17:00 +0000)]
Merge "Add build variant to kernel command line"

8 years agoRename libevent-host to libevent
Dan Willemsen [Thu, 14 Jul 2016 06:47:24 +0000 (23:47 -0700)]
Rename libevent-host to libevent

There's no need to use a different name for target and host modules, and
in Soong, it's better to use the same for both.

Change-Id: Ib2d8d0cc8a1e0f7f95d7c2795a360f02d946fa1a

8 years agoMerge \\"Allow prebuilts to specify mini-debug-info\\" am: 4ea20be28b
Dan Willemsen [Thu, 14 Jul 2016 04:12:24 +0000 (04:12 +0000)]
Merge \\"Allow prebuilts to specify mini-debug-info\\" am: 4ea20be28b
am: d5c3e04c85

Change-Id: I91dae6b09ae0b76905f2b8ea2d39ea815c71ddb7

8 years agoMerge \"Allow prebuilts to specify mini-debug-info\"
Dan Willemsen [Thu, 14 Jul 2016 04:09:47 +0000 (04:09 +0000)]
Merge \"Allow prebuilts to specify mini-debug-info\"
am: 4ea20be28b

Change-Id: I410014ad90800d78753f0c5c8cbb948aef369614

8 years agoMerge "Allow prebuilts to specify mini-debug-info"
Dan Willemsen [Thu, 14 Jul 2016 04:04:42 +0000 (04:04 +0000)]
Merge "Allow prebuilts to specify mini-debug-info"

8 years agoAllow prebuilts to specify mini-debug-info
Dan Willemsen [Wed, 13 Jul 2016 23:08:36 +0000 (16:08 -0700)]
Allow prebuilts to specify mini-debug-info

So that Soong can specify the default that's used by Make.

Change-Id: I0c1062ad8f21df8b9a483f99dce679a1434e4859

8 years agoMerge \\"Fix root_filesystem_config.txt generation\\" am: 461a3283d9
Tao Bao [Wed, 13 Jul 2016 23:17:58 +0000 (23:17 +0000)]
Merge \\"Fix root_filesystem_config.txt generation\\" am: 461a3283d9
am: f464d8e7d4

Change-Id: I688d6b43735adda95c0fea4db32bb71725e12250

8 years agoMerge \"Fix root_filesystem_config.txt generation\"
Gaelle Nassiet [Wed, 13 Jul 2016 23:15:12 +0000 (23:15 +0000)]
Merge \"Fix root_filesystem_config.txt generation\"
am: 461a3283d9

Change-Id: I07ebb4520d02948bff90911d03692d7896dff89c

8 years agoMerge "Fix root_filesystem_config.txt generation"
Tao Bao [Wed, 13 Jul 2016 23:04:10 +0000 (23:04 +0000)]
Merge "Fix root_filesystem_config.txt generation"

8 years agoMerge \\"Pass ENABLE_CPUSETS and ENABLE_SCHEDBOOST to Soong\\" am: b8bd19db88
Dan Willemsen [Wed, 13 Jul 2016 00:44:45 +0000 (00:44 +0000)]
Merge \\"Pass ENABLE_CPUSETS and ENABLE_SCHEDBOOST to Soong\\" am: b8bd19db88
am: 0b728ce11e

Change-Id: I55182beec7dc645c79a1aa668e5854f9b97026ff

8 years agoMerge \"Pass ENABLE_CPUSETS and ENABLE_SCHEDBOOST to Soong\"
Dan Willemsen [Wed, 13 Jul 2016 00:41:21 +0000 (00:41 +0000)]
Merge \"Pass ENABLE_CPUSETS and ENABLE_SCHEDBOOST to Soong\"
am: b8bd19db88

Change-Id: I4d8f00990957b583bf58c4e7770fd73430526431

8 years agoMerge "Pass ENABLE_CPUSETS and ENABLE_SCHEDBOOST to Soong"
Treehugger Robot [Wed, 13 Jul 2016 00:39:05 +0000 (00:39 +0000)]
Merge "Pass ENABLE_CPUSETS and ENABLE_SCHEDBOOST to Soong"

8 years agoPass ENABLE_CPUSETS and ENABLE_SCHEDBOOST to Soong
Dan Willemsen [Tue, 12 Jul 2016 22:00:46 +0000 (15:00 -0700)]
Pass ENABLE_CPUSETS and ENABLE_SCHEDBOOST to Soong

Change-Id: I75c0d60854f2ea3d2e4e4d6dcbc6845e3b0336ad

8 years agoMerge \\"Turn ndk link check warning into error\\" am: 32ebe53d01
Dan Willemsen [Tue, 12 Jul 2016 21:23:04 +0000 (21:23 +0000)]
Merge \\"Turn ndk link check warning into error\\" am: 32ebe53d01
am: 95d3b735b6

Change-Id: I700fa4e5b08149aad3539ae302e904af863e2519

8 years agoMerge \"Turn ndk link check warning into error\"
Dan Willemsen [Tue, 12 Jul 2016 21:19:46 +0000 (21:19 +0000)]
Merge \"Turn ndk link check warning into error\"
am: 32ebe53d01

Change-Id: I89ff2a720b27a288b9f64412dd213d7019ffca66

8 years agoMerge "Turn ndk link check warning into error"
Treehugger Robot [Tue, 12 Jul 2016 21:09:32 +0000 (21:09 +0000)]
Merge "Turn ndk link check warning into error"

8 years agoTurn ndk link check warning into error
Dan Willemsen [Tue, 12 Jul 2016 20:10:31 +0000 (13:10 -0700)]
Turn ndk link check warning into error

All instances of this have been removed from the downstream trees. The
APK->JNI_SHARED_LIBRARY and Java->Java checks remain as warnings.

Change-Id: I3eaee284500deee0f26a4f9cdd96497e99ec533e

8 years agoMerge \\"Remove Android.bp logic from makefiles\\" am: 8bc18d35ec
Colin Cross [Tue, 12 Jul 2016 16:23:10 +0000 (16:23 +0000)]
Merge \\"Remove Android.bp logic from makefiles\\" am: 8bc18d35ec
am: 7dc26e8aa8

Change-Id: Iad45e3fd9b172c94df46d20425e51ae7477b5a2d

8 years agoMerge \"Remove Android.bp logic from makefiles\"
Colin Cross [Tue, 12 Jul 2016 16:20:29 +0000 (16:20 +0000)]
Merge \"Remove Android.bp logic from makefiles\"
am: 8bc18d35ec

Change-Id: I50c8180c8297feb48ff5c5eba10670b36f631921

8 years agoMerge "Remove Android.bp logic from makefiles"
Colin Cross [Tue, 12 Jul 2016 16:15:53 +0000 (16:15 +0000)]
Merge "Remove Android.bp logic from makefiles"

8 years agoRemove Android.bp logic from makefiles
Colin Cross [Mon, 11 Jul 2016 23:57:33 +0000 (16:57 -0700)]
Remove Android.bp logic from makefiles

When Soong was optional, the make build system needed extra complexity
to ignore Android.mk files that had an associated Android.bp file.  Now
that Soong is required and the Android.mk files that were obsoleted by
an associated Android.bp file have been removed, remove all of the logic
that found associated Android.bp files.  Android.mk files and Android.bp
files are now handled independently.

Change-Id: Ia6643d151b920689219ca8abd59ede44d230ba35

8 years agoMerge \\"Extend SDK link check to java libraries\\" am: e706372ba1
Dan Willemsen [Mon, 11 Jul 2016 20:29:47 +0000 (20:29 +0000)]
Merge \\"Extend SDK link check to java libraries\\" am: e706372ba1
am: 720a966ce5

Change-Id: I450ebee38513ec45324c3b32b40db7d98753b22f

8 years agoMerge \"Extend SDK link check to java libraries\"
Dan Willemsen [Mon, 11 Jul 2016 20:27:08 +0000 (20:27 +0000)]
Merge \"Extend SDK link check to java libraries\"
am: e706372ba1

Change-Id: Ia4cb9cfe94da5bdccce8726ed8777de13638bada

8 years agoMerge "Extend SDK link check to java libraries"
Dan Willemsen [Mon, 11 Jul 2016 20:20:40 +0000 (20:20 +0000)]
Merge "Extend SDK link check to java libraries"

8 years agoresolve merge conflicts of 4058a71 to stage-aosp-master
Tao Bao [Mon, 11 Jul 2016 16:16:10 +0000 (16:16 +0000)]
resolve merge conflicts of 4058a71 to stage-aosp-master
am: 538ed261eb

Change-Id: I2ef81a2279ba62bc00c2a40d703666411877058f

8 years agoresolve merge conflicts of 4058a71 to stage-aosp-master
Tao Bao [Mon, 11 Jul 2016 16:08:24 +0000 (09:08 -0700)]
resolve merge conflicts of 4058a71 to stage-aosp-master

Change-Id: I0816bfc5d8adb20e175617d97651f1474ce4e916

8 years agoMerge changes from topic 'imgdiff-squashfs'
Treehugger Robot [Mon, 11 Jul 2016 15:55:51 +0000 (15:55 +0000)]
Merge changes from topic 'imgdiff-squashfs'

* changes:
  releasetools: Fix the detection of using squashfs.
  releasetools: Disable using imgdiff for squashfs.

8 years agoreleasetools: Fix the detection of using squashfs.
Tao Bao [Thu, 7 Jul 2016 16:09:58 +0000 (09:09 -0700)]
releasetools: Fix the detection of using squashfs.

We should disable using imgdiff if *any* of the source and target
partitions uses squashfs.

Bug: 30004734
Test: Create an incremental with two builds with one of them uses squashfs.
Change-Id: I826cd13d7b852c548e4b45e61f5ae00f6407cac3
(cherry picked from commit f8acad1480a3b4479c7ddfa89df8be946d83d3ed)

8 years agoreleasetools: Disable using imgdiff for squashfs.
Tao Bao [Sat, 11 Jun 2016 19:19:23 +0000 (12:19 -0700)]
releasetools: Disable using imgdiff for squashfs.

We use imgdiff to handle files in zip format (e.g. jar/zip/apk) for
higher compression ratio.

For system/vendor in squashfs, a) all files are compressed in LZ4
format; b) we use 4096-byte block size in their sparse images, but the
files in squashfs may not be laid out as 4K-aligned. So the blocks for
a given file as listed in block map may not form a valid zip file, which
may fail the patch generation with imgdiff.

Disable using imgdiff for squashfs images, and use bsdiff instead.

Bug: 22322817
Change-Id: Ie76aa4cece5c9d38cb1d1a34c505a4a8f37512d3
(cherry picked from commit 293fd135c7bc0c21b41f1782d21c26de64e8854a)

8 years agoExtend SDK link check to java libraries
Dan Willemsen [Sat, 9 Jul 2016 04:33:05 +0000 (21:33 -0700)]
Extend SDK link check to java libraries

Java code using the SDK should not link to java code built with the
platform APIs or the system SDK. Java code using the system SDK should
not link to the platform APIs either, but it can link to java code using
another SDK.

Change-Id: Iaae0a7e01993cfa1e023649fbd8a7974b5eca709

8 years agoMerge \\"releasetools: Fix the payload public key replacement.\\" am: 8a09095c34
Tao Bao [Fri, 8 Jul 2016 21:12:58 +0000 (21:12 +0000)]
Merge \\"releasetools: Fix the payload public key replacement.\\" am: 8a09095c34
am: c4449f819c

Change-Id: I1614d0af292c4cb0b6c9b9bc208194c30179c7b9

8 years agoMerge \"releasetools: Fix the payload public key replacement.\"
Tao Bao [Fri, 8 Jul 2016 21:09:20 +0000 (21:09 +0000)]
Merge \"releasetools: Fix the payload public key replacement.\"
am: 8a09095c34

Change-Id: I464ec9dd1a12dcb06bc1dcbf340fdcbac04b9575

8 years agoMerge "releasetools: Fix the payload public key replacement."
Treehugger Robot [Fri, 8 Jul 2016 20:58:49 +0000 (20:58 +0000)]
Merge "releasetools: Fix the payload public key replacement."

8 years agoreleasetools: Fix the payload public key replacement.
Tao Bao [Wed, 6 Jul 2016 22:28:59 +0000 (15:28 -0700)]
releasetools: Fix the payload public key replacement.

update_engine expects the extracted public key instead of the
certificate.

Bug: 28701652
Change-Id: I292d39da9e039f96d01a4214226aeb46f8cb881d
(cherry picked from commit afaf295cb85eb4091bc8a82950acab618b4139ca)

8 years agoFix root_filesystem_config.txt generation
Gaelle Nassiet [Fri, 24 Jun 2016 09:18:53 +0000 (11:18 +0200)]
Fix root_filesystem_config.txt generation

The first line returned by awk is empty. In consequence, when
fs_config computes its mode it will consider this line as a file (no
trailing slash) and affect the default android_files mode which is
0644. The mode for the root directory should be the default
android_dirs mode 0755.
Add a special case in fs_config to consider empty line as a directory.

Change-Id: I9f33f6fcf4be05c31914db898e65c92b0a611518
Signed-off-by: Gaelle Nassiet <gaellex.nassiet@intel.com>
8 years agoMerge \\"Move apksigner library to tools/apksig.\\" am: c78147c650
Alex Klyubin [Thu, 7 Jul 2016 20:43:07 +0000 (20:43 +0000)]
Merge \\"Move apksigner library to tools/apksig.\\" am: c78147c650
am: ee7d7e3506

Change-Id: Ic11bee7e6e0fabfd1849ea9dc47fcd6dc5772d1f

8 years agoMerge \"Move apksigner library to tools/apksig.\"
Alex Klyubin [Thu, 7 Jul 2016 20:40:05 +0000 (20:40 +0000)]
Merge \"Move apksigner library to tools/apksig.\"
am: c78147c650

Change-Id: I34e66d67736fb0a671f8030b4c94983a908e5d8c

8 years agoMerge "Move apksigner library to tools/apksig."
Treehugger Robot [Thu, 7 Jul 2016 20:33:04 +0000 (20:33 +0000)]
Merge "Move apksigner library to tools/apksig."

8 years agoMerge \\"Support LOCAL_STRIP_MODULE := keep_symbols for prebuilts\\" am: aa3525dcf1
Colin Cross [Thu, 7 Jul 2016 19:24:41 +0000 (19:24 +0000)]
Merge \\"Support LOCAL_STRIP_MODULE := keep_symbols for prebuilts\\" am: aa3525dcf1
am: a00b2765cf

Change-Id: I703e53b7847fc4ff4b60972094d13670c3ad7207

8 years agoMerge \"Support LOCAL_STRIP_MODULE := keep_symbols for prebuilts\"
Colin Cross [Thu, 7 Jul 2016 19:21:19 +0000 (19:21 +0000)]
Merge \"Support LOCAL_STRIP_MODULE := keep_symbols for prebuilts\"
am: aa3525dcf1

Change-Id: I968afb2a8abfe9763a6fc1ee7eff5abf41d3a094

8 years agoMerge "Support LOCAL_STRIP_MODULE := keep_symbols for prebuilts"
Treehugger Robot [Thu, 7 Jul 2016 19:14:54 +0000 (19:14 +0000)]
Merge "Support LOCAL_STRIP_MODULE := keep_symbols for prebuilts"

8 years agoMerge \\"Recognize new C/C++ compiler and static analyzer warnings.\\" am: 1734523900
Chih-Hung Hsieh [Thu, 7 Jul 2016 18:28:56 +0000 (18:28 +0000)]
Merge \\"Recognize new C/C++ compiler and static analyzer warnings.\\" am: 1734523900
am: 6beef3807d

Change-Id: I0452a12af98ef1ea8426c0a54211186e4123afdd

8 years agoMerge \"Recognize new C/C++ compiler and static analyzer warnings.\"
Chih-Hung Hsieh [Thu, 7 Jul 2016 18:24:12 +0000 (18:24 +0000)]
Merge \"Recognize new C/C++ compiler and static analyzer warnings.\"
am: 1734523900

Change-Id: I71b8f324ad88ff38b077ba1763c163f9d80a30fa

8 years agoSupport LOCAL_STRIP_MODULE := keep_symbols for prebuilts
Colin Cross [Thu, 7 Jul 2016 18:16:49 +0000 (11:16 -0700)]
Support LOCAL_STRIP_MODULE := keep_symbols for prebuilts

Change-Id: I92a838b07fe4116d5a4b8521fe1ce8d44e6e84e2

8 years agoMerge "Recognize new C/C++ compiler and static analyzer warnings."
Treehugger Robot [Thu, 7 Jul 2016 18:07:21 +0000 (18:07 +0000)]
Merge "Recognize new C/C++ compiler and static analyzer warnings."

8 years agoMove apksigner library to tools/apksig.
Alex Klyubin [Thu, 7 Jul 2016 16:32:28 +0000 (09:32 -0700)]
Move apksigner library to tools/apksig.

This moves build/tools/apksigner/core to its own project tools/apksig.
The move also renames the moved Java packages from
com.android.apksigner.core.* to com.android.apksig.* to reflect the
new name of the library.

Bug: 27461702
Change-Id: Iab812ae2b8f0a741014f842460c78e35bc249d43

8 years agoMerge \\"Never add asan libraries to NDK code\\" am: 59a405c831
Dan Willemsen [Thu, 7 Jul 2016 17:20:45 +0000 (17:20 +0000)]
Merge \\"Never add asan libraries to NDK code\\" am: 59a405c831
am: 83de5d619a

Change-Id: Idbc5a8016d8ea02a7c960f350b411814b67e6c2e

8 years agoMerge \"Never add asan libraries to NDK code\"
Dan Willemsen [Thu, 7 Jul 2016 17:17:44 +0000 (17:17 +0000)]
Merge \"Never add asan libraries to NDK code\"
am: 59a405c831

Change-Id: I6e6129204efe2478c5f7ff6ea0bf04e81203c113

8 years agoMerge "Never add asan libraries to NDK code"
Dan Willemsen [Thu, 7 Jul 2016 17:07:42 +0000 (17:07 +0000)]
Merge "Never add asan libraries to NDK code"

8 years agoMerge \\"APK signer primitive.\\" am: d81beca2b2
Alex Klyubin [Wed, 6 Jul 2016 23:16:52 +0000 (23:16 +0000)]
Merge \\"APK signer primitive.\\" am: d81beca2b2
am: 69c8c38f63

Change-Id: I296cabea0366e48f1ddaa7abcc189a74b90e529d

8 years agoMerge \"APK signer primitive.\"
Alex Klyubin [Wed, 6 Jul 2016 23:14:09 +0000 (23:14 +0000)]
Merge \"APK signer primitive.\"
am: d81beca2b2

Change-Id: I9570df7b5f7a70b4fdd04cbbdeae80d3e5bf9616

8 years agoMerge "APK signer primitive."
Treehugger Robot [Wed, 6 Jul 2016 22:59:32 +0000 (22:59 +0000)]
Merge "APK signer primitive."

8 years agoRecognize new C/C++ compiler and static analyzer warnings.
Chih-Hung Hsieh [Fri, 1 Jul 2016 22:48:06 +0000 (15:48 -0700)]
Recognize new C/C++ compiler and static analyzer warnings.

Change-Id: I5f47c45498c640702922704aa5305a85e9493fcc
Test: run with Android build.log.

8 years agoMerge \"Docs: Adding info in support of TOC for new Performance section.\" into nyc-dev
David Friedman [Fri, 1 Jul 2016 22:37:09 +0000 (22:37 +0000)]
Merge \"Docs: Adding info in support of TOC for new Performance section.\" into nyc-dev
am: 77a4215191

Change-Id: I83cd35ea59fd61d9aeac5961a98970531c68278c

8 years agoMerge "Docs: Adding info in support of TOC for new Performance section." into nyc-dev
Joe Fernandez [Fri, 1 Jul 2016 22:18:19 +0000 (22:18 +0000)]
Merge "Docs: Adding info in support of TOC for new Performance section." into nyc-dev

8 years agoMerge \\"Apply SANITIZE_TARGET=safe-stack to 64 bit targets only.\\" am: 997a6cd1a1
Evgenii Stepanov [Fri, 1 Jul 2016 20:27:43 +0000 (20:27 +0000)]
Merge \\"Apply SANITIZE_TARGET=safe-stack to 64 bit targets only.\\" am: 997a6cd1a1
am: 9223ab05ae

Change-Id: Idd26e5a3e33b0875fb0fec2541a3d47c04bf9c34

8 years agoMerge \"Apply SANITIZE_TARGET=safe-stack to 64 bit targets only.\"
Evgenii Stepanov [Fri, 1 Jul 2016 20:22:41 +0000 (20:22 +0000)]
Merge \"Apply SANITIZE_TARGET=safe-stack to 64 bit targets only.\"
am: 997a6cd1a1

Change-Id: Ic8bc436901efd0b8ba099d68b61faa46a8d503fd

8 years agoMerge \\"Apply SANITIZE_TARGET and LOCAL_SANITIZE when both are present.\\" am: 9c88e...
Evgenii Stepanov [Fri, 1 Jul 2016 20:22:37 +0000 (20:22 +0000)]
Merge \\"Apply SANITIZE_TARGET and LOCAL_SANITIZE when both are present.\\" am: 9c88e0bfa2
am: 120112ee23

Change-Id: I126d080bf84cf049d6f7f8de1881e4f89e057561