OSDN Git Service
Colin Cross [Fri, 15 Jul 2016 22:52:00 +0000 (22:52 +0000)]
resolve merge conflicts of
1e92cfb to stage-aosp-master am:
4cca8a5573 am:
2017d68910
am:
ab632c60b8
Change-Id: I123f98c5d24ec63ca784d4e29b507f9501fbc2c0
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:29:00 +0000 (18:29 +0000)]
resolve merge conflicts of
6471f22 to nyc-mr1-dev-plus-aosp
am:
9568bfbd4c
Change-Id: Ie5b9bd12de4d17bf124745c79bc9893f1c03e110
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 04:18:19 +0000 (04:18 +0000)]
Merge \\\\"Allow prebuilts to specify mini-debug-info\\\\" am:
4ea20be28b am:
d5c3e04c85 am:
6fb6459157
am:
2dcdb6d05c
Change-Id: I3dede8e141cb2e4d6b09729d42fa52dc2986f357
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
Tao Bao [Wed, 13 Jul 2016 23:27:25 +0000 (23:27 +0000)]
Merge \\\\"Fix root_filesystem_config.txt generation\\\\" am:
461a3283d9 am:
f464d8e7d4 am:
32aba08598
am:
5738984509
Change-Id: I4e358320715357b10b188ff1e0b0796ae5d0759a
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:51:49 +0000 (00:51 +0000)]
Merge \\\\"Pass ENABLE_CPUSETS and ENABLE_SCHEDBOOST to Soong\\\\" am:
b8bd19db88 am:
0b728ce11e am:
ab0bd30ba2
am:
218469ec12
Change-Id: I6c31ad16f9b315232a14c4cc7842511ec3355ea9
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:30:13 +0000 (21:30 +0000)]
Merge \\\\"Turn ndk link check warning into error\\\\" am:
32ebe53d01 am:
95d3b735b6 am:
bc5f5f2160
am:
822e07627e
Change-Id: I095a3bfe6c1dc0fe69d22e22d589efb7bb8bcdb7
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:44:36 +0000 (16:44 +0000)]
Merge \\\\"Remove Android.bp logic from makefiles\\\\" am:
8bc18d35ec am:
7dc26e8aa8 am:
95ebfddd5f
am:
64755b9ec5
Change-Id: I53fbff08f5e9341a998a8c0b3fe57873dc7d0a46
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 21:21:20 +0000 (21:21 +0000)]
Merge \"resolve merge conflicts of
333df6c to nyc-mr1-dev-plus-aosp\" into nyc-mr1-dev-plus-aosp
am:
dda7ffbd77
Change-Id: I663dc5642f41aa82c6d967a15f4667b8ea74f6f5
Dan Willemsen [Mon, 11 Jul 2016 21:21:17 +0000 (21:21 +0000)]
Merge \\\\"Extend SDK link check to java libraries\\\\" am:
e706372ba1 am:
720a966ce5 am:
245b024986
am:
57471aa06f
Change-Id: Id56450c2b06b8974f75e77e2f098138f201e4d9a
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"
Tao Bao [Mon, 11 Jul 2016 19:58:20 +0000 (19:58 +0000)]
resolve merge conflicts of
4058a71 to stage-aosp-master am:
538ed261eb am:
4a673770cb
am:
6bd0909da9
Change-Id: I17500f2a01908c0c178390f893aa065e02ea14ca
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:33:53 +0000 (21:33 +0000)]
Merge \\\\"releasetools: Fix the payload public key replacement.\\\\" am:
8a09095c34 am:
c4449f819c am:
dd740c6817
am:
dd312c9308
Change-Id: Ib99daa98ef5bf7a994cc73435645e32d51a2b6b8
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."
Tao Bao [Fri, 8 Jul 2016 20:09:47 +0000 (20:09 +0000)]
Merge \\"releasetools: Fix the payload public key replacement.\\" into nyc-mr1-dev am:
0821fab13a
am:
98c90d1efa
Change-Id: I15995f04e513aeb62760f1cbff9893178a5da4d3
Tao Bao [Fri, 8 Jul 2016 20:02:20 +0000 (20:02 +0000)]
Merge \"releasetools: Fix the payload public key replacement.\" into nyc-mr1-dev
am:
0821fab13a
Change-Id: I15ef57cc520cc2d55ea382688da737d57281358b
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)
Tao Bao [Fri, 8 Jul 2016 19:47:10 +0000 (19:47 +0000)]
Merge "releasetools: Fix the payload public key replacement." into nyc-mr1-dev
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>
Alex Klyubin [Thu, 7 Jul 2016 20:52:07 +0000 (20:52 +0000)]
Merge \\\\"Move apksigner library to tools/apksig.\\\\" am:
c78147c650 am:
ee7d7e3506 am:
188a4191d9
am:
7f1782342f
Change-Id: I47cb4584ebe489028af7c0c8457bcc73a30315de
Alex Klyubin [Thu, 7 Jul 2016 20:46:47 +0000 (20:46 +0000)]
Merge \\\"Move apksigner library to tools/apksig.\\\" am:
c78147c650 am:
ee7d7e3506
am:
188a4191d9
Change-Id: Id2ba6ab6a50d7cdea5fbcc172e0bb030aff3586e
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
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
Treehugger Robot [Thu, 7 Jul 2016 20:33:04 +0000 (20:33 +0000)]
Merge "Move apksigner library to tools/apksig."
Colin Cross [Thu, 7 Jul 2016 19:32:29 +0000 (19:32 +0000)]
Merge \\\\"Support LOCAL_STRIP_MODULE := keep_symbols for prebuilts\\\\" am:
aa3525dcf1 am:
a00b2765cf am:
b82ef6edf4
am:
3a47107c90
Change-Id: I4a1237f6dca0fee93c5564e60f55578aedda3fd3
Colin Cross [Thu, 7 Jul 2016 19:28:59 +0000 (19:28 +0000)]
Merge \\\"Support LOCAL_STRIP_MODULE := keep_symbols for prebuilts\\\" am:
aa3525dcf1 am:
a00b2765cf
am:
b82ef6edf4
Change-Id: I6b700b83c7ca1f7f4c116c1db729cc9b5cd0566c
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
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
Treehugger Robot [Thu, 7 Jul 2016 19:14:54 +0000 (19:14 +0000)]
Merge "Support LOCAL_STRIP_MODULE := keep_symbols for prebuilts"
Chih-Hung Hsieh [Thu, 7 Jul 2016 18:43:54 +0000 (18:43 +0000)]
Merge \\\\"Recognize new C/C++ compiler and static analyzer warnings.\\\\" am:
1734523900 am:
6beef3807d am:
d04cbc6f76
am:
4da10cf1cc
Change-Id: I1ec3e6fa83fabdeee9553be4c94d0eb43b881e7e
Chih-Hung Hsieh [Thu, 7 Jul 2016 18:39:06 +0000 (18:39 +0000)]
Merge \\\"Recognize new C/C++ compiler and static analyzer warnings.\\\" am:
1734523900 am:
6beef3807d
am:
d04cbc6f76
Change-Id: I174e89c9b963cd2c4173ec7dbcfb769f6d443ff0
Tao Bao [Thu, 7 Jul 2016 18:29:04 +0000 (18:29 +0000)]
releasetools: Fix the detection of using squashfs. am:
f8acad1480
am:
ae974f289b
Change-Id: Ie10423de64b9a41b082d8136c6b42809bdcbcb36
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
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
Tao Bao [Thu, 7 Jul 2016 18:24:12 +0000 (18:24 +0000)]
releasetools: Fix the detection of using squashfs.
am:
f8acad1480
Change-Id: I654730ef8566d12ad17a81261b450a695b79686d
Colin Cross [Thu, 7 Jul 2016 18:16:49 +0000 (11:16 -0700)]
Support LOCAL_STRIP_MODULE := keep_symbols for prebuilts
Change-Id: I92a838b07fe4116d5a4b8521fe1ce8d44e6e84e2
Treehugger Robot [Thu, 7 Jul 2016 18:07:21 +0000 (18:07 +0000)]
Merge "Recognize new C/C++ compiler and static analyzer warnings."
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
Dan Willemsen [Thu, 7 Jul 2016 17:27:00 +0000 (17:27 +0000)]
Merge \\\\"Never add asan libraries to NDK code\\\\" am:
59a405c831 am:
83de5d619a am:
6549130e7b
am:
f38af76f84
Change-Id: Ib6e3c4db31a290eafd21f5fc462091dfbcc070e7
Dan Willemsen [Thu, 7 Jul 2016 17:23:52 +0000 (17:23 +0000)]
Merge \\\"Never add asan libraries to NDK code\\\" am:
59a405c831 am:
83de5d619a
am:
6549130e7b
Change-Id: Ibea8c4722f9a3d896a205199593ac89b37e72d8a
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
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
Dan Willemsen [Thu, 7 Jul 2016 17:07:42 +0000 (17:07 +0000)]
Merge "Never add asan libraries to NDK code"
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
Alex Klyubin [Wed, 6 Jul 2016 23:28:27 +0000 (23:28 +0000)]
Merge \\\\"APK signer primitive.\\\\" am:
d81beca2b2 am:
69c8c38f63 am:
a03dc9cab6
am:
68a4e8b78d
Change-Id: Ib17898d18ec19c3c208bbff2574cefe0c6059319
Alex Klyubin [Wed, 6 Jul 2016 23:26:22 +0000 (23:26 +0000)]
Merge \\\"APK signer primitive.\\\" am:
d81beca2b2 am:
69c8c38f63
am:
a03dc9cab6
Change-Id: Ib51b981eeb4c924dda386481cb0f8b5ecbc80393
Alex Klyubin [Wed, 6 Jul 2016 23:16:52 +0000 (23:16 +0000)]
Merge \\"APK signer primitive.\\" am:
d81beca2b2
am:
69c8c38f63
Change-Id: I296cabea0366e48f1ddaa7abcc189a74b90e529d
Alex Klyubin [Wed, 6 Jul 2016 23:14:09 +0000 (23:14 +0000)]
Merge \"APK signer primitive.\"
am:
d81beca2b2
Change-Id: I9570df7b5f7a70b4fdd04cbbdeae80d3e5bf9616
Treehugger Robot [Wed, 6 Jul 2016 22:59:32 +0000 (22:59 +0000)]
Merge "APK signer primitive."
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
Ian Pedowitz [Wed, 6 Jul 2016 19:02:14 +0000 (12:02 -0700)]
resolve merge conflicts of
29fe197 to master
Change-Id: I44e73b53e3cd05faf70412f31bc95d60a1200916