OSDN Git Service
Claes Elgemark [Thu, 21 Jul 2016 15:38:56 +0000 (15:38 +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
am:
3bc451f114
Change-Id: I0de648f14a51602d11c65a1e4671f1e7205bd720
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: I8777c82581d0ba08117c4bc50a6b78b626a81524
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
Chih-Hung Hsieh [Wed, 20 Jul 2016 23:14:05 +0000 (23:14 +0000)]
Merge \\\"Recognize new clang and clang-tidy warnings.\\\" am:
6131119708 am:
bdcc181588
am:
586eecfb44
Change-Id: Iedcb6623ad057a0a04485468193efde425e767f7
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
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
Treehugger Robot [Wed, 20 Jul 2016 22:57:29 +0000 (22:57 +0000)]
Merge "Recognize 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.
Colin Cross [Wed, 20 Jul 2016 21:29:58 +0000 (21:29 +0000)]
Merge \\\"Factor out common include directories into helper\\\" am:
95fa32b577 am:
17904fabbf
am:
dcec798d33
Change-Id: Ia392d0a97ffc54252461e0d5d1716589d71abe0c
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
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
Treehugger Robot [Wed, 20 Jul 2016 21:11:22 +0000 (21:11 +0000)]
Merge "Factor out common include directories into helper"
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
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
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)
Fang Deng [Wed, 20 Jul 2016 00:22:38 +0000 (00:22 +0000)]
Merge \\\"Remove GOMA_HERMETIC form goma.mk\\\" am:
14df2ef4d0 am:
9331f1c8ef
am:
6ba8842b2f
Change-Id: I98de5df822caa2e9114b4e817f357550b7739fc1
Pirama Arumuga Nainar [Wed, 20 Jul 2016 00:22:37 +0000 (00:22 +0000)]
Merge \\\"Switch to prebuilt clang-
3016494\\\" am:
b1beb6f274 am:
8a39030c50
am:
f10de3202f
Change-Id: Iad9a640521b917fbdee0d1bc73c81de12faaa6c6
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
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
Pirama Arumuga Nainar [Tue, 19 Jul 2016 23:58:36 +0000 (23:58 +0000)]
Merge \\\"Disable warnings triggered in Clang r271374\\\" am:
11e0e36462 am:
adac150e40
am:
0e7112d7e6
Change-Id: Ic553f1a42a0357c0e86fdb95bc13bc5fe3b80697
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
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
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
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
Fang Deng [Tue, 19 Jul 2016 23:32:37 +0000 (23:32 +0000)]
Merge "Remove GOMA_HERMETIC form goma.mk"
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
Stephen Hines [Tue, 19 Jul 2016 22:02:31 +0000 (22:02 +0000)]
Merge "Switch to prebuilt clang-
3016494"
Stephen Hines [Tue, 19 Jul 2016 22:02:31 +0000 (22:02 +0000)]
Merge "Disable warnings triggered in Clang r271374"
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
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
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
Chih-Hung Hsieh [Mon, 18 Jul 2016 23:42:52 +0000 (23:42 +0000)]
Merge \\\"Avoid matching the same warning line twice.\\\" am:
0cbba3df2a am:
472589e1cb
am:
bac87ed68b
Change-Id: Id106004dc254c450d20d5bca5e97857f727b97f6
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
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
Treehugger Robot [Mon, 18 Jul 2016 23:18:47 +0000 (23:18 +0000)]
Merge "Avoid 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
Kirill Grouchnikov [Mon, 18 Jul 2016 21:37:08 +0000 (21:37 +0000)]
Rename the source of core-utils module to core-utils
am:
3f06eba6ea
Change-Id: I678d679d1c4c87601a9b9ccef76339bcda85689b
Kirill Grouchnikov [Mon, 18 Jul 2016 14:26:46 +0000 (10:26 -0400)]
Rename the source of core-utils module to core-utils
Change-Id: Ia2db5386ca0048ed70a310a9b13e074d2fedd0a7
(cherry picked from commit
73b833b6a5d9b03c460ec61c5d781c032d6dbe1f)
Dan Willemsen [Mon, 18 Jul 2016 19:33:48 +0000 (19:33 +0000)]
Merge \\\"Rename libevent-host to libevent\\\" am:
575a023039 am:
6d1049454d
am:
1c7467a88d
Change-Id: I3068f539e21abdb3735bac9574acfd0fc4321036
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
Dan Willemsen [Mon, 18 Jul 2016 19:26:18 +0000 (19:26 +0000)]
Merge \"Rename libevent-host to libevent\"
am:
575a023039
Change-Id: Ia98511562db8071258101d38f83f4083db966357
Dan Willemsen [Mon, 18 Jul 2016 19:18:32 +0000 (19:18 +0000)]
Merge "Rename libevent-host to libevent"
Colin Cross [Sun, 17 Jul 2016 23:51:29 +0000 (23:51 +0000)]
Merge \\\"Only add linker_asan as dependency to shared executables\\\" am:
458c0cd37b am:
3721f184f2
am:
c66e36a384
Change-Id: I606c1a6f9354dd0abf9cab086e600f3a42758ca2
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
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
Colin Cross [Sun, 17 Jul 2016 23:38:39 +0000 (23:38 +0000)]
Merge "Only 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
Colin Cross [Fri, 15 Jul 2016 22:33:03 +0000 (22:33 +0000)]
resolve merge conflicts of
1e92cfb to stage-aosp-master am:
4cca8a5573
am:
2017d68910
Change-Id: Ia182609f54288e2867b5aa0f0ca433c577dca7b9
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
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
Treehugger Robot [Fri, 15 Jul 2016 21:34:33 +0000 (21:34 +0000)]
Merge "Add 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
Badhri Jagan Sridharan [Fri, 15 Jul 2016 18:19:51 +0000 (11:19 -0700)]
resolve merge conflicts of
6471f22 to nyc-mr1-dev-plus-aosp
Change-Id: Ied3bf2233e9912c724e8aebe0cbe11ab8955bac6
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
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
Badhri Jagan Sridharan [Fri, 15 Jul 2016 17:00:13 +0000 (17:00 +0000)]
Merge "Add build variant to kernel command line"
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
Dan Willemsen [Thu, 14 Jul 2016 04:15:09 +0000 (04:15 +0000)]
Merge \\\"Allow prebuilts to specify mini-debug-info\\\" am:
4ea20be28b am:
d5c3e04c85
am:
6fb6459157
Change-Id: I2f5470cbc730d786f79dabd509e392222af4b3cf
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
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
Dan Willemsen [Thu, 14 Jul 2016 04:04:42 +0000 (04:04 +0000)]
Merge "Allow 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
Gaelle Nassiet [Wed, 13 Jul 2016 23:20:41 +0000 (23:20 +0000)]
Merge \\\"Fix root_filesystem_config.txt generation\\\" am:
461a3283d9 am:
f464d8e7d4
am:
32aba08598
Change-Id: Ic2a6ea0ced46acabcb2d0410ba0925fbe8075d21
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
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
Tao Bao [Wed, 13 Jul 2016 23:04:10 +0000 (23:04 +0000)]
Merge "Fix root_filesystem_config.txt generation"
Dan Willemsen [Wed, 13 Jul 2016 00:48:24 +0000 (00:48 +0000)]
Merge \\\"Pass ENABLE_CPUSETS and ENABLE_SCHEDBOOST to Soong\\\" am:
b8bd19db88 am:
0b728ce11e
am:
ab0bd30ba2
Change-Id: Id06a4f55b05a1db1afd293cf0f622ef50b5489cf
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
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
Treehugger Robot [Wed, 13 Jul 2016 00:39:05 +0000 (00:39 +0000)]
Merge "Pass 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
Dan Willemsen [Tue, 12 Jul 2016 21:26:21 +0000 (21:26 +0000)]
Merge \\\"Turn ndk link check warning into error\\\" am:
32ebe53d01 am:
95d3b735b6
am:
bc5f5f2160
Change-Id: If373217b96bfbf99878e6f30649e86dc0559d9b8
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
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
Treehugger Robot [Tue, 12 Jul 2016 21:09:32 +0000 (21:09 +0000)]
Merge "Turn 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
Colin Cross [Tue, 12 Jul 2016 16:31:52 +0000 (16:31 +0000)]
Merge \\\"Remove Android.bp logic from makefiles\\\" am:
8bc18d35ec am:
7dc26e8aa8
am:
95ebfddd5f
Change-Id: I22073f2e6788db034f7a904600100d590efec272
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
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
Colin Cross [Tue, 12 Jul 2016 16:15:53 +0000 (16:15 +0000)]
Merge "Remove 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
Tianjie Xu [Mon, 11 Jul 2016 20:38:15 +0000 (20:38 +0000)]
Merge "resolve merge conflicts of
333df6c to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp
Dan Willemsen [Mon, 11 Jul 2016 20:34:51 +0000 (20:34 +0000)]
Merge \\\"Extend SDK link check to java libraries\\\" am:
e706372ba1 am:
720a966ce5
am:
245b024986
Change-Id: I34889f0e04c8512553fde7f3fc2a03f5f1d2231a
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
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
Dan Willemsen [Mon, 11 Jul 2016 20:20:40 +0000 (20:20 +0000)]
Merge "Extend SDK link check to java libraries"
Tianjie Xu [Mon, 11 Jul 2016 18:42:53 +0000 (11:42 -0700)]
resolve merge conflicts of
333df6c to nyc-mr1-dev-plus-aosp
Change-Id: Ibe66a7c78073a9c3e9f139bd6b00a0afab075190
Tianjie Xu [Mon, 11 Jul 2016 17:59:47 +0000 (17:59 +0000)]
Merge "Add care_map to target_files package" into nyc-mr1-dev
Tao Bao [Mon, 11 Jul 2016 16:20:15 +0000 (16:20 +0000)]
resolve merge conflicts of
4058a71 to stage-aosp-master am:
538ed261eb
am:
4a673770cb
Change-Id: Ibb07dea374703ad2098f1c3744fde0b21a54ed3d
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
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
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.
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)
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)
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
Tianjie Xu [Tue, 8 Mar 2016 00:31:19 +0000 (16:31 -0800)]
Add care_map to target_files package
Generate a new file containing care_data of system (and vendor)
partition, and add it under META/ of target file package. For
A/B update, copy this file to OTA package for later use by
update_verifier.
Bug:
27175949
Change-Id: I90bb972703afaeb94bc3efe718fd81b1cfbcabcc
Tao Bao [Fri, 8 Jul 2016 21:17:08 +0000 (21:17 +0000)]
Merge \\\"releasetools: Fix the payload public key replacement.\\\" am:
8a09095c34 am:
c4449f819c
am:
dd740c6817
Change-Id: I3b6be3957589731274ce56034cd5f655874b2fd0
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
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
Treehugger Robot [Fri, 8 Jul 2016 20:58:49 +0000 (20:58 +0000)]
Merge "releasetools: Fix the payload public key replacement."
OSDN Git Service
