OSDN Git Service
Gaurav Shah [Tue, 3 Nov 2015 00:48:56 +0000 (00:48 +0000)]
Merge "build: Add support for defining products in /product" am:
acb8a7c1f8 am:
881ec090c4
am:
555489aa84
* commit '
555489aa84954ff9de6e661169c5c0fe95f62c40':
build: Add support for defining products in /product
Gaurav Shah [Mon, 2 Nov 2015 22:29:57 +0000 (22:29 +0000)]
Merge "build: Add support for defining products in /product" am:
acb8a7c1f8
am:
881ec090c4
* commit '
881ec090c4790bdd588048f17038d167d7b52d87':
build: Add support for defining products in /product
Gaurav Shah [Mon, 2 Nov 2015 22:27:08 +0000 (22:27 +0000)]
Merge "build: Add support for defining products in /product"
am:
acb8a7c1f8
* commit '
acb8a7c1f8cacaf136edba1a25d64467d352a432':
build: Add support for defining products in /product
Gaurav Shah [Mon, 2 Nov 2015 22:22:22 +0000 (22:22 +0000)]
Merge "build: Add support for defining products in /product"
Lee Campbell [Thu, 20 Aug 2015 20:55:45 +0000 (13:55 -0700)]
build: Add support for defining products in /product
The build will now search for AndroidProducts.mk in /product
BUG:
22030305
Change-Id: I2d067d95d0c8dc1341a55167f9ac7f6926e04ce3
Ying Wang [Mon, 2 Nov 2015 20:01:16 +0000 (20:01 +0000)]
Merge "Add _asan suffix to ro.build.flavor for ASAN builds." am:
f0a8dd43b2 am:
cce30b6daa
am:
5d95b4aa93
* commit '
5d95b4aa935e37fee0f68a97953c6e440974af0d':
Add _asan suffix to ro.build.flavor for ASAN builds.
Ying Wang [Mon, 2 Nov 2015 20:01:10 +0000 (20:01 +0000)]
Merge "Fix "make product-graph" and "make dump-products"." am:
888f30aa44 am:
603e4ed594
am:
6a019f1d2e
* commit '
6a019f1d2ec88baeaa5c95c76ea966e562bdfa3a':
Fix "make product-graph" and "make dump-products".
Ying Wang [Mon, 2 Nov 2015 19:55:12 +0000 (19:55 +0000)]
Merge "Add _asan suffix to ro.build.flavor for ASAN builds." am:
f0a8dd43b2
am:
cce30b6daa
* commit '
cce30b6daae84f194a3d71a1e7c452345999c925':
Add _asan suffix to ro.build.flavor for ASAN builds.
Ying Wang [Mon, 2 Nov 2015 19:55:06 +0000 (19:55 +0000)]
Merge "Fix "make product-graph" and "make dump-products"." am:
888f30aa44
am:
603e4ed594
* commit '
603e4ed594b99b9463a9a67c1f7ba91b2967025e':
Fix "make product-graph" and "make dump-products".
Ying Wang [Mon, 2 Nov 2015 19:52:04 +0000 (19:52 +0000)]
Merge "Add _asan suffix to ro.build.flavor for ASAN builds."
am:
f0a8dd43b2
* commit '
f0a8dd43b26d49ad67e2c6c8c936e64a62df8582':
Add _asan suffix to ro.build.flavor for ASAN builds.
Ying Wang [Mon, 2 Nov 2015 19:51:57 +0000 (19:51 +0000)]
Merge "Fix "make product-graph" and "make dump-products"."
am:
888f30aa44
* commit '
888f30aa448370206a49ff7df940e134b8ff7017':
Fix "make product-graph" and "make dump-products".
Ying Wang [Mon, 2 Nov 2015 19:47:31 +0000 (19:47 +0000)]
Merge "Add _asan suffix to ro.build.flavor for ASAN builds."
Ying Wang [Mon, 2 Nov 2015 19:46:53 +0000 (19:46 +0000)]
Merge "Fix "make product-graph" and "make dump-products"."
Chris Palmer [Fri, 30 Oct 2015 20:28:51 +0000 (20:28 +0000)]
Merge "Make URLs either HTTPS or protocol-relative."
Dan Willemsen [Thu, 29 Oct 2015 21:42:07 +0000 (21:42 +0000)]
Merge "Revert "Remove changing uids/timestamps from zip/jar files"" am:
49d8c5196e am:
d8d06da814
am:
5887bfbe20
* commit '
5887bfbe203d47849993b3cdbe54d6f0a155a071':
Revert "Remove changing uids/timestamps from zip/jar files"
Dan Willemsen [Thu, 29 Oct 2015 21:38:10 +0000 (21:38 +0000)]
Merge "Revert "Remove changing uids/timestamps from zip/jar files"" am:
49d8c5196e
am:
d8d06da814
* commit '
d8d06da814fa02413bc3e58f3047f9a2ab61bb09':
Revert "Remove changing uids/timestamps from zip/jar files"
Dan Willemsen [Thu, 29 Oct 2015 21:33:39 +0000 (21:33 +0000)]
Merge "Revert "Remove changing uids/timestamps from zip/jar files""
am:
49d8c5196e
* commit '
49d8c5196eb690fc987673c27cb61087c5886be4':
Revert "Remove changing uids/timestamps from zip/jar files"
Dan Willemsen [Thu, 29 Oct 2015 21:28:17 +0000 (21:28 +0000)]
Merge "Revert "Remove changing uids/timestamps from zip/jar files""
Dan Willemsen [Thu, 29 Oct 2015 21:26:18 +0000 (21:26 +0000)]
Revert "Remove changing uids/timestamps from zip/jar files"
This reverts commit
3c2c064c8791ed2d4b9d6780d7b87f406ab78f10.
zipalign depends on libandroidfw, and some setups don't include frameworks/base.
Bug:
24201956
Change-Id: I48ee95808924f6b2221f0a49ab205c2565096b1f
Dan Willemsen [Thu, 29 Oct 2015 19:20:55 +0000 (19:20 +0000)]
Merge "Remove changing uids/timestamps from zip/jar files" am:
9f25219371 am:
a51b1d532e
am:
aa851650bf
* commit '
aa851650bf73d8143da011013bd64cd49969be96':
Remove changing uids/timestamps from zip/jar files
Tao Bao [Thu, 29 Oct 2015 19:20:49 +0000 (19:20 +0000)]
Merge "Honor TARGET_NO_RECOVERY flag." am:
c448e91c3d am:
e5eb4567d4
am:
b7e92cf344
* commit '
b7e92cf344c54af39d44905d5d8a4d9d79f6a5c4':
Honor TARGET_NO_RECOVERY flag.
Sami Tolvanen [Thu, 29 Oct 2015 19:20:42 +0000 (19:20 +0000)]
Merge "Error correction: Use block_image_recover in block OTAs" am:
fe4e86c7fd am:
a25cced65f
am:
bc946c6521
* commit '
bc946c65213a131d672f0f897989d71177d32ea4':
Error correction: Use block_image_recover in block OTAs
Dan Willemsen [Thu, 29 Oct 2015 19:15:52 +0000 (19:15 +0000)]
Merge "Remove changing uids/timestamps from zip/jar files" am:
9f25219371
am:
a51b1d532e
* commit '
a51b1d532e998c1668fd991f53c6619e02d9338a':
Remove changing uids/timestamps from zip/jar files
Dan Willemsen [Thu, 29 Oct 2015 19:12:37 +0000 (19:12 +0000)]
Merge "Remove changing uids/timestamps from zip/jar files"
am:
9f25219371
* commit '
9f252193714c82dbce702e8055ffaa7eec4afe66':
Remove changing uids/timestamps from zip/jar files
Dan Willemsen [Thu, 29 Oct 2015 19:07:36 +0000 (19:07 +0000)]
Merge "Remove changing uids/timestamps from zip/jar files"
Dan Willemsen [Tue, 27 Oct 2015 23:25:29 +0000 (16:25 -0700)]
Remove changing uids/timestamps from zip/jar files
Pass -X to zip so that Unix UID/GID and extra timestamps aren't
saved into the zip files.
Add a new option to zipalign, -t, to replace all timestamps with static
timestamps (2008 Jan 1 00:00:00). Use this for all non-APK zip files.
APK zip timestamps are set based on the certificate date in SignApk.
Bug:
24201956
Change-Id: Ifb619fc499ba9d99fc624f2acd5f8de36d78ef8e
Tao Bao [Thu, 29 Oct 2015 16:49:53 +0000 (16:49 +0000)]
Merge "Honor TARGET_NO_RECOVERY flag." am:
c448e91c3d
am:
e5eb4567d4
* commit '
e5eb4567d408808873d7193fcaf7bfea859ea725':
Honor TARGET_NO_RECOVERY flag.
Sami Tolvanen [Thu, 29 Oct 2015 16:49:37 +0000 (16:49 +0000)]
Merge "Error correction: Use block_image_recover in block OTAs" am:
fe4e86c7fd
am:
a25cced65f
* commit '
a25cced65f3418b86ba7c3707f29838f4794f8b6':
Error correction: Use block_image_recover in block OTAs
Tao Bao [Thu, 29 Oct 2015 16:45:31 +0000 (16:45 +0000)]
Merge "Honor TARGET_NO_RECOVERY flag."
am:
c448e91c3d
* commit '
c448e91c3d3d095f8f200c9925f7db2ad525132f':
Honor TARGET_NO_RECOVERY flag.
Sami Tolvanen [Thu, 29 Oct 2015 16:45:14 +0000 (16:45 +0000)]
Merge "Error correction: Use block_image_recover in block OTAs"
am:
fe4e86c7fd
* commit '
fe4e86c7fd1b9c8903fda194b8515451c477ced9':
Error correction: Use block_image_recover in block OTAs
Tao Bao [Thu, 29 Oct 2015 16:13:52 +0000 (16:13 +0000)]
Merge "Honor TARGET_NO_RECOVERY flag."
Sami Tolvanen [Thu, 29 Oct 2015 16:05:46 +0000 (16:05 +0000)]
Merge "Error correction: Use block_image_recover in block OTAs"
Sami Tolvanen [Thu, 25 Jun 2015 10:48:29 +0000 (11:48 +0100)]
Error correction: Use block_image_recover in block OTAs
If block_image_verify fails, attempt to recover using FEC before giving up.
Bug:
21893453
Change-Id: Ibc1fe5d28b2a8099d2b5094277b572ec08229c3a
Ying Wang [Thu, 29 Oct 2015 01:45:03 +0000 (18:45 -0700)]
Add _asan suffix to ro.build.flavor for ASAN builds.
Bug:
25344475
Change-Id: I27f2472906631239ca725ee09da2ab791cad2195
Ying Wang [Thu, 29 Oct 2015 00:02:58 +0000 (00:02 +0000)]
Merge "Normalize the product makefile path in inherit-product." am:
aabff90bfe am:
3482ea54a2
am:
4f5e8cc3ca
* commit '
4f5e8cc3ca6da83f11bf42d04f1a57b9af16a582':
Normalize the product makefile path in inherit-product.
Ying Wang [Wed, 28 Oct 2015 23:59:12 +0000 (23:59 +0000)]
Merge "Normalize the product makefile path in inherit-product." am:
aabff90bfe
am:
3482ea54a2
* commit '
3482ea54a2fecc756c79a94f37a66113d21d7558':
Normalize the product makefile path in inherit-product.
Ying Wang [Wed, 28 Oct 2015 23:55:10 +0000 (23:55 +0000)]
Merge "Normalize the product makefile path in inherit-product."
am:
aabff90bfe
* commit '
aabff90bfe2312a95d3cf57564845fef8dc469a2':
Normalize the product makefile path in inherit-product.
Ying Wang [Wed, 28 Oct 2015 23:51:57 +0000 (23:51 +0000)]
Merge "Normalize the product makefile path in inherit-product."
Ying Wang [Wed, 28 Oct 2015 23:42:39 +0000 (16:42 -0700)]
Fix "make product-graph" and "make dump-products".
- For unmodified "make product-graph" and "make dump-products",
load only the current product configuration makefiles. This is much
faster than loading all product makefiles.
- For "make product-graph ANDROID_PRODUCT_GRAPH=--all",
"make dump-products ANDROID_DUMP_PRODUCTS=all", load all product
makefiles.
- Move product-graph.mk out of build tasks, so we can skip loading all
the Android.mks, which takes long and we don't really need them.
More importantly, with all product makefiles loaded, modules in
Android.mks are prone to clash (if they are conditionally included
by variables set up in product makefiles) and lead to parse-time
error.
Change-Id: Idc1d6b0c23eb2c8bb34fdd7a1fa4d56171768d21
Ying Wang [Wed, 28 Oct 2015 21:33:40 +0000 (14:33 -0700)]
Normalize the product makefile path in inherit-product.
Some vendor product makefiles call $(inherit-product) on the same
product makefile with different paths, by using "../" in relative paths.
However inherit-product requires unique path as ID for a product
makefile, for bookkeeping purpose.
Normalize the product makefile path in inherit-product, if the path
contains "../".
Change-Id: I1a864ce120c713d8e79ec179213b9fc9352aba53
Colin Cross [Wed, 28 Oct 2015 21:20:09 +0000 (21:20 +0000)]
Merge "Remove use of .INTERMEDIATE" am:
dda5e96b14 am:
24ef58d163
am:
0dc087dff7
* commit '
0dc087dff769ef5b1d44ad1f2e0f36cb053867a9':
Remove use of .INTERMEDIATE
Colin Cross [Wed, 28 Oct 2015 21:15:27 +0000 (21:15 +0000)]
Merge "Remove use of .INTERMEDIATE" am:
dda5e96b14
am:
24ef58d163
* commit '
24ef58d1638716c1fdbc130e6cf871d052e9d672':
Remove use of .INTERMEDIATE
Colin Cross [Wed, 28 Oct 2015 21:12:02 +0000 (21:12 +0000)]
Merge "Remove use of .INTERMEDIATE"
am:
dda5e96b14
* commit '
dda5e96b144c15a75d625ceac7e92b50cf9c363a':
Remove use of .INTERMEDIATE
Colin Cross [Wed, 28 Oct 2015 21:09:05 +0000 (21:09 +0000)]
Merge "Remove use of .INTERMEDIATE"
Colin Cross [Wed, 28 Oct 2015 20:28:11 +0000 (13:28 -0700)]
Remove use of .INTERMEDIATE
make 3.81 has a bug where combining an up-to-date .INTERMEDIATE rule
with -j causes an infinite loop (http://savannah.gnu.org/bugs/?15919).
.INTERMEDIATE was only necessary to support multiple outputs while only
running a command once, remove .INTERMEDIATE by replacing
$(KATI_OUTPUTS) dependencies with $(KATI_BUILD_NINJA). We can assume
that $(KATI_NINJA_SH) will be updated at the same time as
$(KATI_BUILD_NINJA), and not explicitly depend on it.
Also remove generateonly and fastincremental, which are no longer
necessary and were overcomplicating ninja.mk. kati now always runs due
to FORCE, and ninja is run by a phony rule that depends on
$(KATI_BUILD_NINJA).
Bug:
25344116
Change-Id: I99d2713b1532ea11d83da9a11b1be26cfe13a5d2
Marco Nelissen [Wed, 28 Oct 2015 17:30:40 +0000 (17:30 +0000)]
Merge "Add extractorservice executable to base config"
Tao Bao [Wed, 28 Oct 2015 02:25:18 +0000 (19:25 -0700)]
Honor TARGET_NO_RECOVERY flag.
Don't generate recovery.img when calling 'make dist' if
TARGET_NO_RECOVERY is set. The build system passes the flag to the
packaging script which then generates recovery.img conditionally.
Bug:
25329471
Change-Id: Ifbc999300d5c31e897878f81e231ae7dd2aca660
Chih-hung Hsieh [Wed, 28 Oct 2015 01:46:34 +0000 (01:46 +0000)]
Merge "Move arm64 target to clang by default." am:
befb82f204 am:
b7ad8778cd
am:
72d90d25d0
* commit '
72d90d25d028f62b584cfdaa3c2c7fba68ed74d4':
Move arm64 target to clang by default.
Chih-Hung Hsieh [Tue, 27 Oct 2015 23:48:38 +0000 (16:48 -0700)]
resolve merge conflicts of
b5775d97b4 to master.
Change-Id: I99fda2935ab74e0634c1aa4905ce4da693e96cb6
Colin Cross [Tue, 27 Oct 2015 23:27:47 +0000 (23:27 +0000)]
Merge "Error out early on nonstandard JDK directory layouts" am:
506113d267 am:
e95cf75293
am:
1ac51c013e
* commit '
1ac51c013e134c7a22580f9020e3b89851153a7e':
Error out early on nonstandard JDK directory layouts
Chih-hung Hsieh [Tue, 27 Oct 2015 23:20:46 +0000 (23:20 +0000)]
Merge "Move arm64 target to clang by default." am:
befb82f204
am:
b7ad8778cd
* commit '
b7ad8778cd054932a6f85bd9b3a010767ffbec04':
Move arm64 target to clang by default.
Chih-hung Hsieh [Tue, 27 Oct 2015 23:20:37 +0000 (23:20 +0000)]
Merge "Move arm target to clang by default." am:
873d394c54
am:
639ab89a11
* commit '
639ab89a1183b91e40bb0d4f82cda61962635849':
Move arm target to clang by default.
Chih-hung Hsieh [Tue, 27 Oct 2015 23:12:23 +0000 (23:12 +0000)]
Merge "Move arm64 target to clang by default."
am:
befb82f204
* commit '
befb82f20429b469aaebf6c8e7d0a2c4a0d414e3':
Move arm64 target to clang by default.
Chih-hung Hsieh [Tue, 27 Oct 2015 23:12:13 +0000 (23:12 +0000)]
Merge "Move arm target to clang by default."
am:
873d394c54
* commit '
873d394c543e2d0ac96736db77b88e41acb5bc36':
Move arm target to clang by default.
Chih-hung Hsieh [Tue, 27 Oct 2015 23:02:26 +0000 (23:02 +0000)]
Merge "Move arm64 target to clang by default."
Chih-hung Hsieh [Tue, 27 Oct 2015 23:02:10 +0000 (23:02 +0000)]
Merge "Move arm target to clang by default."
Chih-Hung Hsieh [Tue, 27 Oct 2015 20:44:53 +0000 (13:44 -0700)]
Move arm64 target to clang by default.
Bug:
23163853
Change-Id: I59c311f552ca060bc7bd034fa4f1c03eb24802d5
Chih-Hung Hsieh [Tue, 27 Oct 2015 20:42:34 +0000 (13:42 -0700)]
Move arm target to clang by default.
Bug:
23163853
Change-Id: I4cb95ed652ca697461e2fb22811779aa2df8d262
Colin Cross [Tue, 27 Oct 2015 19:22:07 +0000 (19:22 +0000)]
Merge "Error out early on nonstandard JDK directory layouts" am:
506113d267
am:
e95cf75293
* commit '
e95cf75293c7111957229ae898ad1afd453ead50':
Error out early on nonstandard JDK directory layouts
Colin Cross [Tue, 27 Oct 2015 19:17:38 +0000 (19:17 +0000)]
Merge "Error out early on nonstandard JDK directory layouts"
am:
506113d267
* commit '
506113d2671e8f3dd5a46b63b7996accec6acb35':
Error out early on nonstandard JDK directory layouts
Colin Cross [Tue, 27 Oct 2015 19:12:40 +0000 (19:12 +0000)]
Merge "Error out early on nonstandard JDK directory layouts"
Ying Wang [Tue, 27 Oct 2015 19:01:15 +0000 (19:01 +0000)]
Merge "Revert "Enable gold linker for aarch64."" am:
edfa0981c9 am:
5eccb209d0
am:
fd06048887
* commit '
fd06048887e75a87e900ac56aa174cbb5f5d27d8':
Revert "Enable gold linker for aarch64."
Ying Wang [Tue, 27 Oct 2015 18:55:19 +0000 (18:55 +0000)]
Merge "Revert "Enable gold linker for aarch64."" am:
edfa0981c9
am:
5eccb209d0
* commit '
5eccb209d06bcc9c7502d5767dbc6c9e2fc7f8c5':
Revert "Enable gold linker for aarch64."
Ying Wang [Tue, 27 Oct 2015 18:49:07 +0000 (18:49 +0000)]
Merge "Revert "Enable gold linker for aarch64.""
am:
edfa0981c9
* commit '
edfa0981c958453215fbbfccdcf6d05662cf9583':
Revert "Enable gold linker for aarch64."
Ying Wang [Tue, 27 Oct 2015 18:36:47 +0000 (18:36 +0000)]
Merge "Revert "Enable gold linker for aarch64.""
Dan Albert [Tue, 27 Oct 2015 18:18:46 +0000 (18:18 +0000)]
Revert "Enable gold linker for aarch64."
Causes build failures on Darwin.
prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9/aarch64-linux-android/bin/ld.gold: warning: cannot scan executable section 5 of out/target/product/flounder/obj/SHARED_LIBRARIES/libdl_intermediates/libdl.o for Cortex-A53 erratum because it has no mapping symbols.
prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9/aarch64-linux-android/bin/ld.gold: warning: cannot scan executable section 8 of out/target/product/flounder/obj/SHARED_LIBRARIES/libdl_intermediates/libdl.o for Cortex-A53 erratum because it has no mapping symbols.
prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9/aarch64-linux-android/bin/ld.gold: warning: cannot scan executable section 11 of out/target/product/flounder/obj/SHARED_LIBRARIES/libdl_intermediates/libdl.o for Cortex-A53 erratum because it has no mapping symbols.
prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9/aarch64-linux-android/bin/ld.gold: error: treating warnings as errors
This reverts commit
127d110172818c7dce14fefcc72b07a18686ee9c.
Change-Id: I1d3de90f5ae777b66a8f94fbcc9ccde8a9e3001c
Marco Nelissen [Fri, 25 Sep 2015 22:02:06 +0000 (15:02 -0700)]
Add extractorservice executable to base config
Change-Id: I0ffbe183decfd76be681e08b8627c3d789c4b916
Zach Jang [Tue, 27 Oct 2015 00:58:58 +0000 (00:58 +0000)]
Merge "Update security string to 2015-12-01" into mnc-dev am:
54cb940c4a am:
dfd3524f7b am:
eca2b655e5 am:
e23d93a7f2
am:
6e32e64077
* commit '
6e32e6407720944125b941ea651b2bc03c5b67b0':
Update security string to 2015-12-01
Zach Jang [Tue, 27 Oct 2015 00:55:45 +0000 (00:55 +0000)]
Merge "Update security string to 2015-12-01" into mnc-dev am:
54cb940c4a am:
dfd3524f7b am:
eca2b655e5
am:
e23d93a7f2
* commit '
e23d93a7f2a0d6e0da12123dc8ed6f2e65bd805c':
Update security string to 2015-12-01
Zach Jang [Tue, 27 Oct 2015 00:52:13 +0000 (00:52 +0000)]
Merge "Update security string to 2015-12-01" into mnc-dev am:
54cb940c4a am:
dfd3524f7b
am:
eca2b655e5
* commit '
eca2b655e5a57f0a13c55d815f6b18d8d03160fb':
Update security string to 2015-12-01
Zach Jang [Tue, 27 Oct 2015 00:48:30 +0000 (00:48 +0000)]
Merge "Update security string to 2015-12-01" into mnc-dev am:
54cb940c4a
am:
dfd3524f7b
* commit '
dfd3524f7b1fb2f0346eee7fa0dc42e8888f68aa':
Update security string to 2015-12-01
Zach Jang [Tue, 27 Oct 2015 00:44:56 +0000 (00:44 +0000)]
Merge "Update security string to 2015-12-01" into mnc-dev
am:
54cb940c4a
* commit '
54cb940c4a07701212e96f77ee4a89493b0f251b':
Update security string to 2015-12-01
Zach Jang [Tue, 27 Oct 2015 00:37:40 +0000 (00:37 +0000)]
Merge "Update security string to 2015-12-01" into mnc-dev
Ying Wang [Tue, 27 Oct 2015 00:22:37 +0000 (00:22 +0000)]
Merge "Strip LOCAL_MODULE before referencing it." am:
411b2f90a9 am:
fbb85a95b5
am:
86a7c218e0
* commit '
86a7c218e02e59810525f28da9b81eca4390bbbf':
Strip LOCAL_MODULE before referencing it.
Ying Wang [Tue, 27 Oct 2015 00:16:05 +0000 (00:16 +0000)]
Merge "Strip LOCAL_MODULE before referencing it." am:
411b2f90a9
am:
fbb85a95b5
* commit '
fbb85a95b5d1089c335106c33ce3613e3e39702a':
Strip LOCAL_MODULE before referencing it.
Ying Wang [Tue, 27 Oct 2015 00:12:53 +0000 (00:12 +0000)]
Merge "Strip LOCAL_MODULE before referencing it."
am:
411b2f90a9
* commit '
411b2f90a95e5a471f248ec769826cf22dd12296':
Strip LOCAL_MODULE before referencing it.
Zach Jang [Tue, 27 Oct 2015 00:09:07 +0000 (00:09 +0000)]
Update security string to 2015-12-01 - DO NOT MERGE am:
6575d4a2a8 am:
cc9ac27157 am:
fe64ce145e -s ours am:
0e8cf97670 am:
07e2c19536 am:
a3b35dec78 am:
3c407e4573
am:
695235afe3 -s ours
* commit '
695235afe33865b62299e63fb52e47458285bc7b':
Update security string to 2015-12-01 - DO NOT MERGE
Ying Wang [Tue, 27 Oct 2015 00:08:05 +0000 (00:08 +0000)]
Merge "Strip LOCAL_MODULE before referencing it."
Ying Wang [Fri, 16 Oct 2015 00:47:09 +0000 (17:47 -0700)]
Strip LOCAL_MODULE before referencing it.
Bug:
24985980
Change-Id: Ic97e852aa7a8bf2d9224d3d6656d33145cc67800
(cherry-pick from commit
4d20a32a793a4a52d53b3a3a8e66cf04089093dc)
Zach Jang [Tue, 27 Oct 2015 00:05:35 +0000 (00:05 +0000)]
Update security string to 2015-12-01 - DO NOT MERGE am:
6575d4a2a8 am:
cc9ac27157 am:
fe64ce145e -s ours am:
0e8cf97670 am:
07e2c19536 am:
a3b35dec78
am:
3c407e4573
* commit '
3c407e457391816eea27e847e9f8d3da9383256a':
Update security string to 2015-12-01 - DO NOT MERGE
Zach Jang [Tue, 27 Oct 2015 00:02:12 +0000 (00:02 +0000)]
Update security string to 2015-12-01 - DO NOT MERGE am:
6575d4a2a8 am:
cc9ac27157 am:
fe64ce145e -s ours am:
0e8cf97670 am:
07e2c19536
am:
a3b35dec78
* commit '
a3b35dec78b8afe7e29e3d6a0fc7524b5fd846a2':
Update security string to 2015-12-01 - DO NOT MERGE
Zach Jang [Mon, 26 Oct 2015 23:57:13 +0000 (23:57 +0000)]
Update security string to 2015-12-01 - DO NOT MERGE am:
6575d4a2a8 am:
cc9ac27157 am:
fe64ce145e -s ours am:
0e8cf97670
am:
07e2c19536
* commit '
07e2c195367119faa4645d3f9f0dcb1c6aba7396':
Update security string to 2015-12-01 - DO NOT MERGE
Zach Jang [Mon, 26 Oct 2015 23:52:50 +0000 (23:52 +0000)]
Update security string to 2015-12-01 - DO NOT MERGE am:
6575d4a2a8 am:
cc9ac27157 am:
fe64ce145e -s ours
am:
0e8cf97670
* commit '
0e8cf97670c0b0a59d326507296829fe1bc01230':
Update security string to 2015-12-01 - DO NOT MERGE
Zach Jang [Mon, 26 Oct 2015 23:49:22 +0000 (23:49 +0000)]
Update security string to 2015-12-01 - DO NOT MERGE am:
6575d4a2a8 am:
cc9ac27157
am:
fe64ce145e -s ours
* commit '
fe64ce145e243fb3fde5a788bcd800c2987da37c':
Update security string to 2015-12-01 - DO NOT MERGE
Zach Jang [Mon, 26 Oct 2015 23:46:01 +0000 (23:46 +0000)]
Update security string to 2015-12-01 - DO NOT MERGE am:
6575d4a2a8
am:
cc9ac27157
* commit '
cc9ac271575b4c1ef3a2bff3fbdaf2b201c6e75d':
Update security string to 2015-12-01 - DO NOT MERGE
Zach Jang [Mon, 26 Oct 2015 23:42:57 +0000 (23:42 +0000)]
Update security string to 2015-12-01 - DO NOT MERGE
am:
6575d4a2a8
* commit '
6575d4a2a8c78a703e5c2e2889ecb358668d1bbd':
Update security string to 2015-12-01 - DO NOT MERGE
Dan Albert [Mon, 26 Oct 2015 21:19:46 +0000 (21:19 +0000)]
Merge "Drop GCC back to C++11." am:
dba46710fe am:
a01ec70d92
am:
bcaf671bb6
* commit '
bcaf671bb6aba1b49efc930a330977d07ac7cef6':
Drop GCC back to C++11.
Dan Albert [Mon, 26 Oct 2015 21:14:46 +0000 (21:14 +0000)]
Merge "Drop GCC back to C++11." am:
dba46710fe
am:
a01ec70d92
* commit '
a01ec70d92fa95d0851171f9f40eeb6d4dcb7dd3':
Drop GCC back to C++11.
Dan Albert [Mon, 26 Oct 2015 21:10:15 +0000 (21:10 +0000)]
Merge "Drop GCC back to C++11."
am:
dba46710fe
* commit '
dba46710fe5bb0ea3bea8c3c0fea76273d343ff3':
Drop GCC back to C++11.
Dan Albert [Mon, 26 Oct 2015 21:05:39 +0000 (21:05 +0000)]
Merge "Drop GCC back to C++11."
Dan Albert [Mon, 26 Oct 2015 18:09:24 +0000 (11:09 -0700)]
Drop GCC back to C++11.
Our GCC does not use a valid C++14 ABI.
Bug: http://b/
25022512
Change-Id: I6f4b3450137c24a6a0c00bf956bae7a0ba280094
Than McIntosh [Mon, 26 Oct 2015 12:36:19 +0000 (12:36 +0000)]
Merge "Enable gold linker for aarch64." am:
14c2d968b9 am:
52cc54dcee
am:
77bdc82f5f
* commit '
77bdc82f5f4a3c11f911853bb0fc62d84df40e76':
Enable gold linker for aarch64.
Than McIntosh [Mon, 26 Oct 2015 12:31:34 +0000 (12:31 +0000)]
Merge "Enable gold linker for aarch64." am:
14c2d968b9
am:
52cc54dcee
* commit '
52cc54dceeb17fa6818b6a3e1496c894cb2bd231':
Enable gold linker for aarch64.
Than McIntosh [Mon, 26 Oct 2015 12:27:28 +0000 (12:27 +0000)]
Merge "Enable gold linker for aarch64."
am:
14c2d968b9
* commit '
14c2d968b913573e7a21fe72723254c9cc277210':
Enable gold linker for aarch64.
Than McIntosh [Mon, 26 Oct 2015 12:22:26 +0000 (12:22 +0000)]
Merge "Enable gold linker for aarch64."
Colin Cross [Sat, 24 Oct 2015 21:18:41 +0000 (21:18 +0000)]
Merge "Add dummy description for GET-INSTALL-PATH" am:
9d192f1c10 am:
bc20982b40
am:
ca440e58d1
* commit '
ca440e58d1a3b20db752a3bc0415819fc123f19f':
Add dummy description for GET-INSTALL-PATH
Colin Cross [Sat, 24 Oct 2015 21:15:53 +0000 (21:15 +0000)]
Merge "Add dummy description for GET-INSTALL-PATH" am:
9d192f1c10
am:
bc20982b40
* commit '
bc20982b405a228984f9242957a23db6d463aad2':
Add dummy description for GET-INSTALL-PATH
Colin Cross [Sat, 24 Oct 2015 21:13:05 +0000 (21:13 +0000)]
Merge "Add dummy description for GET-INSTALL-PATH"
am:
9d192f1c10
* commit '
9d192f1c1090a757c9218296457482d2ba737989':
Add dummy description for GET-INSTALL-PATH
Colin Cross [Sat, 24 Oct 2015 21:09:34 +0000 (21:09 +0000)]
Merge "Add dummy description for GET-INSTALL-PATH"
Colin Cross [Sat, 24 Oct 2015 04:38:12 +0000 (21:38 -0700)]
Add dummy description for GET-INSTALL-PATH
kati takes the first @echo command in a rule and turns it in to a ninja
description that gets pretty-printed. The GET-INSTALL-PATH is only
@echo commands and is parsed by development/testrunner/runtest.py, so
it fails to parse the pretty-printed first test.
Add a dummy @echo to GET-INSTALL-PATH for kati to use as the
description, so the rest of the @echo commands are left unmodified.
Change-Id: I192fde48b26726a2f6760448f819243bd2f21312