Commit Graph

25846 Commits

Author SHA1 Message Date
Chih-Hung Hsieh cf67f13792 Move arm64 target to clang by default.
Bug: 23163853
Change-Id: I59c311f552ca060bc7bd034fa4f1c03eb24802d5
2015-10-27 13:44:53 -07:00
Chih-Hung Hsieh 557fa2f3cd Move arm target to clang by default.
Bug: 23163853
Change-Id: I4cb95ed652ca697461e2fb22811779aa2df8d262
2015-10-27 13:42:34 -07:00
Colin Cross 1ac51c013e Merge "Error out early on nonstandard JDK directory layouts" am: 506113d267
am: e95cf75293

* commit 'e95cf75293c7111957229ae898ad1afd453ead50':
  Error out early on nonstandard JDK directory layouts
2015-10-27 19:22:07 +00:00
Colin Cross e95cf75293 Merge "Error out early on nonstandard JDK directory layouts"
am: 506113d267

* commit '506113d2671e8f3dd5a46b63b7996accec6acb35':
  Error out early on nonstandard JDK directory layouts
2015-10-27 19:17:38 +00:00
Colin Cross 506113d267 Merge "Error out early on nonstandard JDK directory layouts" 2015-10-27 19:12:40 +00:00
Ying Wang fd06048887 Merge "Revert "Enable gold linker for aarch64."" am: edfa0981c9
am: 5eccb209d0

* commit '5eccb209d06bcc9c7502d5767dbc6c9e2fc7f8c5':
  Revert "Enable gold linker for aarch64."
2015-10-27 18:55:19 +00:00
Ying Wang 5eccb209d0 Merge "Revert "Enable gold linker for aarch64.""
am: edfa0981c9

* commit 'edfa0981c958453215fbbfccdcf6d05662cf9583':
  Revert "Enable gold linker for aarch64."
2015-10-27 18:49:07 +00:00
Ying Wang edfa0981c9 Merge "Revert "Enable gold linker for aarch64."" 2015-10-27 18:36:47 +00:00
Dan Albert e4256f5759 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 127d110172.

Change-Id: I1d3de90f5ae777b66a8f94fbcc9ccde8a9e3001c
2015-10-27 18:18:46 +00:00
Zach Jang 6e32e64077 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
2015-10-27 00:55:45 +00:00
Zach Jang e23d93a7f2 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
2015-10-27 00:52:13 +00:00
Zach Jang eca2b655e5 Merge "Update security string to 2015-12-01" into mnc-dev am: 54cb940c4a
am: dfd3524f7b

* commit 'dfd3524f7b1fb2f0346eee7fa0dc42e8888f68aa':
  Update security string to 2015-12-01
2015-10-27 00:48:30 +00:00
Zach Jang dfd3524f7b Merge "Update security string to 2015-12-01" into mnc-dev
am: 54cb940c4a

* commit '54cb940c4a07701212e96f77ee4a89493b0f251b':
  Update security string to 2015-12-01
2015-10-27 00:44:56 +00:00
Zach Jang 54cb940c4a Merge "Update security string to 2015-12-01" into mnc-dev 2015-10-27 00:37:40 +00:00
Ying Wang 86a7c218e0 Merge "Strip LOCAL_MODULE before referencing it." am: 411b2f90a9
am: fbb85a95b5

* commit 'fbb85a95b5d1089c335106c33ce3613e3e39702a':
  Strip LOCAL_MODULE before referencing it.
2015-10-27 00:16:05 +00:00
Ying Wang fbb85a95b5 Merge "Strip LOCAL_MODULE before referencing it."
am: 411b2f90a9

* commit '411b2f90a95e5a471f248ec769826cf22dd12296':
  Strip LOCAL_MODULE before referencing it.
2015-10-27 00:12:53 +00:00
Ying Wang 411b2f90a9 Merge "Strip LOCAL_MODULE before referencing it." 2015-10-27 00:08:05 +00:00
Ying Wang 227cdd02c4 Strip LOCAL_MODULE before referencing it.
Bug: 24985980
Change-Id: Ic97e852aa7a8bf2d9224d3d6656d33145cc67800
(cherry-pick from commit 4d20a32a79)
2015-10-26 17:06:08 -07:00
Zach Jang 695235afe3 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
2015-10-27 00:05:35 +00:00
Zach Jang 3c407e4573 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
2015-10-27 00:02:12 +00:00
Zach Jang a3b35dec78 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
2015-10-26 23:57:13 +00:00
Zach Jang 07e2c19536 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
2015-10-26 23:52:50 +00:00
Zach Jang 0e8cf97670 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
2015-10-26 23:49:22 +00:00
Zach Jang fe64ce145e 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
2015-10-26 23:46:01 +00:00
Zach Jang cc9ac27157 Update security string to 2015-12-01 - DO NOT MERGE
am: 6575d4a2a8

* commit '6575d4a2a8c78a703e5c2e2889ecb358668d1bbd':
  Update security string to 2015-12-01 - DO NOT MERGE
2015-10-26 23:42:57 +00:00
Dan Albert bcaf671bb6 Merge "Drop GCC back to C++11." am: dba46710fe
am: a01ec70d92

* commit 'a01ec70d92fa95d0851171f9f40eeb6d4dcb7dd3':
  Drop GCC back to C++11.
2015-10-26 21:14:46 +00:00
Dan Albert a01ec70d92 Merge "Drop GCC back to C++11."
am: dba46710fe

* commit 'dba46710fe5bb0ea3bea8c3c0fea76273d343ff3':
  Drop GCC back to C++11.
2015-10-26 21:10:15 +00:00
Dan Albert dba46710fe Merge "Drop GCC back to C++11." 2015-10-26 21:05:39 +00:00
Dan Albert da63739767 Drop GCC back to C++11.
Our GCC does not use a valid C++14 ABI.

Bug: http://b/25022512
Change-Id: I6f4b3450137c24a6a0c00bf956bae7a0ba280094
2015-10-26 11:28:33 -07:00
Than McIntosh 77bdc82f5f Merge "Enable gold linker for aarch64." am: 14c2d968b9
am: 52cc54dcee

* commit '52cc54dceeb17fa6818b6a3e1496c894cb2bd231':
  Enable gold linker for aarch64.
2015-10-26 12:31:34 +00:00
Than McIntosh 52cc54dcee Merge "Enable gold linker for aarch64."
am: 14c2d968b9

* commit '14c2d968b913573e7a21fe72723254c9cc277210':
  Enable gold linker for aarch64.
2015-10-26 12:27:28 +00:00
Than McIntosh 14c2d968b9 Merge "Enable gold linker for aarch64." 2015-10-26 12:22:26 +00:00
Colin Cross ca440e58d1 Merge "Add dummy description for GET-INSTALL-PATH" am: 9d192f1c10
am: bc20982b40

* commit 'bc20982b405a228984f9242957a23db6d463aad2':
  Add dummy description for GET-INSTALL-PATH
2015-10-24 21:15:53 +00:00
Colin Cross bc20982b40 Merge "Add dummy description for GET-INSTALL-PATH"
am: 9d192f1c10

* commit '9d192f1c1090a757c9218296457482d2ba737989':
  Add dummy description for GET-INSTALL-PATH
2015-10-24 21:13:05 +00:00
Colin Cross 9d192f1c10 Merge "Add dummy description for GET-INSTALL-PATH" 2015-10-24 21:09:34 +00:00
Colin Cross ec1b561981 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
2015-10-23 21:38:12 -07:00
Colin Cross 112753ca55 Error out early on nonstandard JDK directory layouts
On Darwin, javac may be located in a nonstandard directory layout such as:
/System/Library/Frameworks/JavaVM.framework/Versions/Current/Commands/javac
The sed command to replace bin/javac with lib/tools.jar would fail to
match, resulting in the HOST_JDK_TOOLS_JAR being set to the javac path.
Since javac exists, the checks for missing tools.jar would all pass, and
javac would be added to the classpath instead of tools.jar, and causing
hard to debug errors about missing com.sun.javadoc when building doclava.

Change the sed command to replace /javac$, which should always be found,
with /../lib/tools.jar.

Change-Id: I5072f04636a5c14b3aeaa3a5cc3b366feae89c37
2015-10-23 19:00:43 -07:00
Ying Wang 8ac0c4bebb Merge "Normalize java source file paths before running "sort -u"." am: 0d4dad46f4
am: 471d347b89

* commit '471d347b8928e6b030d94869a2a9229086b79528':
  Normalize java source file paths before running "sort -u".
2015-10-23 20:28:15 +00:00
Ying Wang 471d347b89 Merge "Normalize java source file paths before running "sort -u"."
am: 0d4dad46f4

* commit '0d4dad46f44d6f4a498a1a8205a4b26ae2e55ac5':
  Normalize java source file paths before running "sort -u".
2015-10-23 20:24:52 +00:00
Ying Wang 0d4dad46f4 Merge "Normalize java source file paths before running "sort -u"." 2015-10-23 20:21:10 +00:00
Ying Wang 4d68879ca6 Normalize java source file paths before running "sort -u".
We rely on "sort -u" to dedupe aidl/logtags generated java files added
by both from $(all_java_sources) and from "find
$(PRIVATE_SOURCE_INTERMEDIATES_DIR) -name '*.java".
But "sort -u" doesn't work if any of the aidl/logtags source file path
has "../" in it.
This change fixes this issue by normalizing the source file paths before
passing them to "sort -u".

Change-Id: I12d2c4e0397bed9f426a1ed9b13608d72d01e0df
2015-10-23 13:19:47 -07:00
Tao Bao 5ddc4ac802 Merge "Bump up the BBOTA version to 4." am: ac4ec1a4ea
am: ada3927e53

* commit 'ada3927e53f5ff99beb6919162ea186924cb7621':
  Bump up the BBOTA version to 4.
2015-10-23 18:49:59 +00:00
Tao Bao ada3927e53 Merge "Bump up the BBOTA version to 4."
am: ac4ec1a4ea

* commit 'ac4ec1a4ea83a150e08ccd43f30fe34de52cdebf':
  Bump up the BBOTA version to 4.
2015-10-23 18:45:35 +00:00
Tao Bao ac4ec1a4ea Merge "Bump up the BBOTA version to 4." 2015-10-23 18:38:03 +00:00
Ying Wang a34fb5fe34 Merge "Make sure R.stamp is always created" am: 47e46f7725
am: 3d7584d9c3

* commit '3d7584d9c3b619619eaf10a0110f28f4f802f2cb':
  Make sure R.stamp is always created
2015-10-23 18:22:31 +00:00
Ying Wang 3d7584d9c3 Merge "Make sure R.stamp is always created"
am: 47e46f7725

* commit '47e46f77257e172c3603208587cce55c0a9fc28f':
  Make sure R.stamp is always created
2015-10-23 18:16:45 +00:00
Ying Wang 47e46f7725 Merge "Make sure R.stamp is always created" 2015-10-23 18:09:11 +00:00
Martin Arenlind fb6985e4dc Make sure R.stamp is always created
When an app has a resource directory, but the
directory contain no resources, R.stamp is not created.

This leads to that such apps are always rebuilt,
even when there are no changes.

This patch changes so that an empty R.stamp is
created even if there are no resources.
This leads to that affected apps are not rebuilt
unless changed.

Change-Id: Ia63e5b1913a4456402700b615ba7f9d56d2da852
2015-10-23 11:07:28 -07:00
Tao Bao eba409c4da Bump up the BBOTA version to 4.
To accommodate new changes (such as error correction in [1]) to BBOTA
in N release. We bump up the version to keep the OTA script backward
compatible.

Needs the matching CL in commit
1fdec8685af858c5ff4f45d2e3059186ab5ed2ab.

[1]: commit 0a7b47397db3648afe6f3aeb2abb175934c2cbca

Change-Id: Ib9158b455cd5905fe2d4742ce81feb1b7583054f
2015-10-23 10:45:36 -07:00
Alex Deymo 47d31960d5 Merge "Rename UPDATE_AB_PARTITIONS to AB_OTA_PARTITIONS." am: c82b873b9b
am: 7410ed86c6

* commit '7410ed86c6ffa165ee7cc4b142e9843c18ae61a6':
  Rename UPDATE_AB_PARTITIONS to AB_OTA_PARTITIONS.
2015-10-23 14:51:34 +00:00