Commit Graph

8680 Commits

Author SHA1 Message Date
Tao Bao
a76a06e05e Merge "Honor TARGET_NO_RECOVERY flag." am: c448e91c3d am: e5eb4567d4
am: b7e92cf344

* commit 'b7e92cf344c54af39d44905d5d8a4d9d79f6a5c4':
  Honor TARGET_NO_RECOVERY flag.
2015-10-29 19:20:49 +00:00
Tao Bao
b7e92cf344 Merge "Honor TARGET_NO_RECOVERY flag." am: c448e91c3d
am: e5eb4567d4

* commit 'e5eb4567d408808873d7193fcaf7bfea859ea725':
  Honor TARGET_NO_RECOVERY flag.
2015-10-29 16:49:53 +00:00
Tao Bao
e5eb4567d4 Merge "Honor TARGET_NO_RECOVERY flag."
am: c448e91c3d

* commit 'c448e91c3d3d095f8f200c9925f7db2ad525132f':
  Honor TARGET_NO_RECOVERY flag.
2015-10-29 16:45:31 +00:00
Tao Bao
c448e91c3d Merge "Honor TARGET_NO_RECOVERY flag." 2015-10-29 16:13:52 +00:00
Ying Wang
471bf958cd 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.
2015-10-29 00:02:58 +00:00
Ying Wang
4f5e8cc3ca Merge "Normalize the product makefile path in inherit-product." am: aabff90bfe
am: 3482ea54a2

* commit '3482ea54a2fecc756c79a94f37a66113d21d7558':
  Normalize the product makefile path in inherit-product.
2015-10-28 23:59:12 +00:00
Ying Wang
3482ea54a2 Merge "Normalize the product makefile path in inherit-product."
am: aabff90bfe

* commit 'aabff90bfe2312a95d3cf57564845fef8dc469a2':
  Normalize the product makefile path in inherit-product.
2015-10-28 23:55:10 +00:00
Ying Wang
a174261042 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
2015-10-28 15:20:41 -07:00
Colin Cross
cfb21b2be3 Merge "Remove use of .INTERMEDIATE" am: dda5e96b14 am: 24ef58d163
am: 0dc087dff7

* commit '0dc087dff769ef5b1d44ad1f2e0f36cb053867a9':
  Remove use of .INTERMEDIATE
2015-10-28 21:20:09 +00:00
Colin Cross
0dc087dff7 Merge "Remove use of .INTERMEDIATE" am: dda5e96b14
am: 24ef58d163

* commit '24ef58d1638716c1fdbc130e6cf871d052e9d672':
  Remove use of .INTERMEDIATE
2015-10-28 21:15:27 +00:00
Colin Cross
24ef58d163 Merge "Remove use of .INTERMEDIATE"
am: dda5e96b14

* commit 'dda5e96b144c15a75d625ceac7e92b50cf9c363a':
  Remove use of .INTERMEDIATE
2015-10-28 21:12:02 +00:00
Colin Cross
42470e915d 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
2015-10-28 13:31:40 -07:00
Tao Bao
db45efa647 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
2015-10-27 20:00:10 -07:00
Colin Cross
a9373f8e24 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
2015-10-27 23:27:47 +00: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
3d77b98d57 Merge "Revert "Enable gold linker for aarch64."" am: edfa0981c9 am: 5eccb209d0
am: fd06048887

* commit 'fd06048887e75a87e900ac56aa174cbb5f5d27d8':
  Revert "Enable gold linker for aarch64."
2015-10-27 19:01:15 +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
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
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
Dan Albert
15e5ed2bdf Merge "Drop GCC back to C++11." am: dba46710fe am: a01ec70d92
am: bcaf671bb6

* commit 'bcaf671bb6aba1b49efc930a330977d07ac7cef6':
  Drop GCC back to C++11.
2015-10-26 21:19:46 +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
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
71163efe7f Merge "Enable gold linker for aarch64." am: 14c2d968b9 am: 52cc54dcee
am: 77bdc82f5f

* commit '77bdc82f5f4a3c11f911853bb0fc62d84df40e76':
  Enable gold linker for aarch64.
2015-10-26 12:36:19 +00: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
44cadc8601 Merge "Add dummy description for GET-INSTALL-PATH" am: 9d192f1c10 am: bc20982b40
am: ca440e58d1

* commit 'ca440e58d1a3b20db752a3bc0415819fc123f19f':
  Add dummy description for GET-INSTALL-PATH
2015-10-24 21:18:41 +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
df28897515 Merge "Normalize java source file paths before running "sort -u"." 2015-10-23 20:20:29 +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
a9887d52b7 Merge "Bump up the BBOTA version to 4." am: ac4ec1a4ea am: ada3927e53
am: 5ddc4ac802

* commit '5ddc4ac8028e1bfdf0f2cb3ea6b80762c73cd281':
  Bump up the BBOTA version to 4.
2015-10-23 18:55:16 +00: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
62170e2004 Merge "Make sure R.stamp is always created" am: 47e46f7725 am: 3d7584d9c3
am: a34fb5fe34

* commit 'a34fb5fe3445bf6f185720a3f029da4d39268dc6':
  Make sure R.stamp is always created
2015-10-23 18:27:25 +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