p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
24,717 Commits 1 Branch 0 Tags 68 MiB
Commit Graph

7986 Commits

Author SHA1 Message Date
Ying Wang d6679fbc7e am 9412efdc: Merge "Don\'t build otatools.zip if we don\'t build the ota package." 
* commit '9412efdc1b9f54e1bc8df3ea3e8e34b7d899cc70':
  Don't build otatools.zip if we don't build the ota package.
 2015-09-22 18:50:52 +00:00
Ying Wang bd2d024778 Don't build otatools.zip if we don't build the ota package. 
Also added flag TARGET_SKIP_OTA_PACKAGE to allow product to skip ota
package.

Bug: 24295339
Change-Id: Ib613ed747528661a6572b577cd54ccb6c2d1fdc8
 2015-09-22 11:41:59 -07:00
Colin Cross 425d0248a1 am 9ff24387: Merge "Make USE_NINJA=true the default" 
* commit '9ff24387c205da60e3d7deb042530b1d0b2d881c':
  Make USE_NINJA=true the default
 2015-09-22 17:12:43 +00:00
Colin Cross 9ff24387c2 Merge "Make USE_NINJA=true the default" 2015-09-22 17:05:22 +00:00
Dan Albert 1721cbcb0d am 30b32620: Merge "Revert "Don\'t re-export libgcc symbols from every object."" 
* commit '30b326206ba0148da32c1419f210bd6e6890236d':
  Revert "Don't re-export libgcc symbols from every object."
 2015-09-21 19:40:55 +00:00
Dan Albert 30b326206b Merge "Revert "Don't re-export libgcc symbols from every object."" 2015-09-21 19:20:24 +00:00
Dan Albert 5408ff73d6 Revert "Don't re-export libgcc symbols from every object." 
For some reason shamu doesn't boot after this change.

Bug: http://b/24166967

This reverts commit e92d25f296.

Change-Id: Ibd90c0fccb1fe7446f959c937963d1aa4e43c37c
 2015-09-21 19:19:02 +00:00
Ying Wang 197e592ea5 am 3c4c3418: Merge "Don\'t add build number to apps\' version name for platform build." 
* commit '3c4c34183a10fd3deac81a8fc1fed8c774f12190':
  Don't add build number to apps' version name for platform build.
 2015-09-20 03:41:43 +00:00
Colin Cross a084f2c73b am 0881ce18: Merge changes Ic1be7572,Id6481430 
* commit '0881ce1817395d62d2746a14350767bf411f89d4':
  Pass --ninja to makeparallel for ninja
  makeparallel: improve support for wrapping ninja
 2015-09-19 19:52:44 +00:00
Christopher Ferris 2649e750b6 am 9bc462c1: Merge "Add the common directory back to kernel headers." 
* commit '9bc462c12a5c4519b00e988b738c029c688c12d5':
  Add the common directory back to kernel headers.
 2015-09-19 19:52:16 +00:00
Ying Wang d75d893da8 Don't add build number to apps' version name for platform build. 
Bug: 24201956
Change-Id: I4a4bb483bb7b1bf7b7a856050d548bee4db0fe93
 2015-09-19 10:56:35 -07:00
Colin Cross 0881ce1817 Merge changes Ic1be7572,Id6481430 
* changes:
  Pass --ninja to makeparallel for ninja
  makeparallel: improve support for wrapping ninja
 2015-09-18 23:33:59 +00:00
Colin Cross f77030bb30 Make USE_NINJA=true the default 
Build with kati + ninja by default, unless specifically disabled with
USE_NINJA=false in the environment or on the make command line.

Bug: 23565895
Change-Id: I1fa9f5c6eb4d4ed3f5b81454f89d19fd2f1f6abb
 2015-09-18 15:10:21 -07:00
Colin Cross af6c071a5f Pass --ninja to makeparallel for ninja 
When parallelism is being handled by ninja, pass --ninja to makeparallel
to have it translate -j with no number to default ninja parallelism, and
-k to -k0.

Bug: 24199503
Change-Id: Ic1be7572f93b33e4a71ed23e9e73dea1d4255703
 2015-09-18 15:02:40 -07:00
Christopher Ferris 9bc462c12a Merge "Add the common directory back to kernel headers." 2015-09-18 20:44:58 +00:00
Evgenii Stepanov f267f7147f am 908260a5: Merge "Add support of SANITIZE_TARGET=\'address coverage\' for fuzzing." 
* commit '908260a56631cad51196c7b197f720bc88d7f5c7':
  Add support of SANITIZE_TARGET='address coverage' for fuzzing.
 2015-09-18 20:31:54 +00:00
Evgenii Stepanov 908260a566 Merge "Add support of SANITIZE_TARGET='address coverage' for fuzzing." 2015-09-18 20:21:54 +00:00
Ivan Krasin 74b32b8dfc Add support of SANITIZE_TARGET='address coverage' for fuzzing. 
Also, add trace-cmp instrumentation to fuzz_test and host_fuzz_test.

Bug: 22850550
Change-Id: Ifff7b8be693ae991feb0a64e19439370a19b2748
 2015-09-18 11:54:43 -07:00
Dan Albert 5397ba5584 am 000e1a97: Merge "Don\'t re-export libgcc symbols from every object." 
* commit '000e1a973ec83cb2af644ce72a46f1c026299a7d':
  Don't re-export libgcc symbols from every object.
 2015-09-18 17:29:22 +00:00
Dan Albert 000e1a973e Merge "Don't re-export libgcc symbols from every object." 2015-09-18 17:21:13 +00:00
Christopher Ferris 6a2f28514c Add the common directory back to kernel headers. 
There will only be a very small set of non-uapi headers. This is
mostly being done for the scsi headers since the kernel has not
made uapi versions of all of them.

Change-Id: I44904b07ff96de918dc5fcab4e5f117a34cb2a87
 2015-09-17 21:20:03 -07:00
Dan Albert e92d25f296 Don't re-export libgcc symbols from every object. 
Target modules shouldn't re-export libgcc.a because we don't want
other binaries importing them when they should be getting their own
copy of the builtins.

Bug: http://b/24166967
Change-Id: Iaa208933885375da4a8e1b8935f76e9f3ea0647f
 2015-09-17 17:18:12 -07:00
Scott James Remnant d8f08571b3 am 909fe8e0: Merge "build: support compiling .mm on host" 
* commit '909fe8e0f7da8db09a004ef44a90e786c81df5e4':
  build: support compiling .mm on host
 2015-09-17 23:15:30 +00:00
Scott James Remnant dd86e5a0de build: support compiling .mm on host 
libchrome uses .mm (Objective-C++) files to bridge C++ code with
OS X Frameworks. This adds support for compiling .mm to .o by just
using the existing C++ support.

Bug: 24168923
Change-Id: Ia65357e2e2584dfffcb6796e214fe6b27635c3a6
 2015-09-17 15:51:32 -07:00
Dan Albert d9f9836e5e am 3ee9daac: Merge "Remove WITHOUT_(HOST|TARGET)_CLANG." 
* commit '3ee9daac6a3bf8d2a9030b99f62595330f22cafa':
  Remove WITHOUT_(HOST|TARGET)_CLANG.
 2015-09-16 23:31:41 +00:00
Dan Albert 3ee9daac6a Merge "Remove WITHOUT_(HOST|TARGET)_CLANG." 2015-09-16 23:24:40 +00:00
Ying Wang bc195b36d7 am 6fb36397: Merge "Use /ninja_build to mark ninja build." 
* commit '6fb36397e56336e08a75e7101d6d47a98a27aea1':
  Use $(OUT_DIR)/ninja_build to mark ninja build.
 2015-09-16 23:21:04 +00:00
Dan Albert 32f7ff14ce Remove WITHOUT_(HOST|TARGET)_CLANG. 
This is unused.

Change-Id: Ibc461fef02c82d110718003aceffb943c930ffe6
 2015-09-16 15:43:00 -07:00
Ying Wang eb1e18e689 Use $(OUT_DIR)/ninja_build to mark ninja build. 
Bug: 23565895
Change-Id: I000e88a45278fd52096312262eacc52511f02efb
 2015-09-16 15:29:08 -07:00
Ying Wang 942672d82b am 45075cf6: Merge "Generate installed-files-vendor.txt" 
* commit '45075cf623fc59930594ac27c675cd43e36975b1':
  Generate installed-files-vendor.txt
 2015-09-15 23:10:16 +00:00
Ying Wang 8da19e3688 Generate installed-files-vendor.txt 
Similar to installed-files.txt, installed-files-vendor.txt lists the
content of vendor.img.

Bug: 24009297
Change-Id: Ib8112b19cc9f54d0c0d6a829063e4fe72d8ce664
 2015-09-15 14:24:00 -07:00
Dan Willemsen ca72e5eb61 am b384eb84: Merge "kati: Handle MAKECMDGOALS modifications" 
* commit 'b384eb84c3bbea9630d805f5825320e7f9acc2ba':
  kati: Handle MAKECMDGOALS modifications
 2015-09-15 00:35:13 +00:00
Dan Willemsen b384eb84c3 Merge "kati: Handle MAKECMDGOALS modifications" 2015-09-15 00:28:42 +00:00
Colin Cross e173cb8b38 am 4ce3cea7: Merge changes I6e4f957c,Id41a2d81 
* commit '4ce3cea77065396b81a4e50283b785e9cc64788f':
  Use makeparallel to propagate -j flag to ninja or kati
  Implement makeparallel
 2015-09-15 00:25:06 +00:00
Dan Willemsen cb1bd116ed kati: Handle MAKECMDGOALS modifications 
For some special targets (PRODUCT-%), the MAKECMDGOALS variable is
modified. Before this change, using one would result in a "no rule to
make target" error, since the new target was not stubbed out.

Change-Id: I879642a48b84a66789d4bdb7db1b6fd1130819b7
 2015-09-14 16:30:51 -07:00
Colin Cross f7ca64faa0 Use makeparallel to propagate -j flag to ninja or kati 
When USE_NINJA=true is set, use makeparallel to claim all jobs from make and
pass them to ninja with -j.  If USE_GOMA is set, pass the -j flag to
kati instead so the parallelism can be set in the local_pool instead.

Change-Id: I6e4f957c65683b74533ecb6d33e25de858922823
 2015-09-14 14:41:00 -07:00
Dan Albert 91a0082fbc am da196abf: Merge "Fix `LOCAL_CXX_STL := none` for Windows." 
* commit 'da196abf10fd9a500fe223952d96cf93ed699983':
  Fix `LOCAL_CXX_STL := none` for Windows.
 2015-09-11 22:14:30 +00:00
Dan Albert d1d68b19ac Fix `LOCAL_CXX_STL := none` for Windows. 
We still need to link the various MSVC libraries even if we aren't
using the STL.

Bug: http://b/22953515
Change-Id: I73c35710a6162408e99480a4840eedd291adf7ab
 2015-09-11 13:37:51 -07:00
Shinichiro Hamaji 4bbf8fae16 am 6d20af03: Merge "Use the same build.ninja for normal make targets" 
* commit '6d20af0391569a2f7b70a6816ddaf316b15e5a70':
  Use the same build.ninja for normal make targets
 2015-09-10 03:37:24 +00:00
Shinichiro Hamaji 6d20af0391 Merge "Use the same build.ninja for normal make targets" 2015-09-10 03:31:59 +00:00
Dan Willemsen abf6d7a3c5 am 96d3c0d0: Merge "Update the build system doc" 
* commit '96d3c0d0b14e94583438d9e93f011b1b0c930e38':
  Update the build system doc
 2015-09-10 00:53:08 +00:00
Dan Willemsen 0b6c3481d5 Update the build system doc 
This adds a reference to the _{32|64|arm|arm64|...|darwin|linux|windows}
variables, and adds information about how LOCAL_MODULE_HOST_OS works.

It also removes many (but not all) obsolete references.

Bug: 23566667
Change-Id: Ief16a5e245eb65ac00fc23d4fc1b7a409a7a64bd
 2015-09-10 00:20:12 +00:00
Dan Willemsen 749e07c648 am c8db47a0: Merge "Don\'t build windows modules with clang, fix flags" 
* commit 'c8db47a0213aa5c204c140cb9268389b4175ae06':
  Don't build windows modules with clang, fix flags
 2015-09-09 23:25:11 +00:00
Dan Willemsen 7728817ab9 Don't build windows modules with clang, fix flags 
shamu checkbuilds set USE_CLANG_PLATFORM_BUILD, which shouldn't apply to
modules built for windows. Also fix some flags that were being set
improperly.

Bug: 23566667
Change-Id: Id4c5b7cc59966328483d90f2b7be3f35e439ecee
 2015-09-09 16:10:50 -07:00
Dan Willemsen c98d9a9d0f am f1c09d7f: Merge "Add HOST_CROSS_OS" 
* commit 'f1c09d7fbd92a08cc51950a7d35fb5f7fc564a20':
  Add HOST_CROSS_OS
 2015-09-09 18:19:13 +00:00
Dan Albert 4ecedbc823 am feb3ecaf: Merge "Fix name for NDK protobuf libraries." 
* commit 'feb3ecaff02d2bddb82aae0fa3024d9b9a62169e':
  Fix name for NDK protobuf libraries.
 2015-09-09 18:19:11 +00:00
Dan Willemsen f1c09d7fbd Merge "Add HOST_CROSS_OS" 2015-09-09 18:13:21 +00:00
Dan Willemsen 057aaea54a Add HOST_CROSS_OS 
Instead of using recursive make to change the HOST_OS when building the
windows SDK under linux, add the concept of cross-building to another
host os.

Bug: 23566667
Change-Id: I6dc525b601b6251d458d197c30bf4660d7485502
 2015-09-09 18:12:29 +00:00
Shinichiro Hamaji d762bcae25 Use the same build.ninja for normal make targets 
$(PARSE_TIME_MAKE_GOALS) is a list of known goals which affect
parsing of make (e.g., there is $(filter XXX,$(MAKECMDGOALS))).
If the make targets contain one of them, we keep using a
different build.ninja for each combination of make targets.
Otherwise, we use the same build.ninja which has all phony
targets.

Also load vendor/google/build/ninja_config.mk so it can add
Google-specific goals to $(PARSE_TIME_MAKE_GOALS).

Bug: 23685536
Change-Id: I3da5c76fa7644a05a55c374a754212f4fb794818
 2015-09-09 15:48:10 +09:00
Dan Albert a187fb5986 Fix name for NDK protobuf libraries. 
Name them *-ndk so it's clear which library is which.

Change-Id: I53544a8a97488f902e00d1aedaa021d09ee2f649
 2015-09-08 10:47:03 -07:00
Shinichiro Hamaji ebbea4f4e8 am e711afb1: Merge "Use as a part of ninja suffix" 
* commit 'e711afb154333407fe42e8ffe36bf76448d4f80f':
  Use $(BUILD_MODULES_IN_PATHS) as a part of ninja suffix
 2015-09-07 05:44:30 +00:00
Shinichiro Hamaji e711afb154 Merge "Use $(BUILD_MODULES_IN_PATHS) as a part of ninja suffix" 2015-09-07 05:38:24 +00:00
Dan Willemsen f41a670d51 am 76274670: Merge "Fix LOCAL_MODULE_HOST_OS" 
* commit '762746705c7414985dbd457481dd33d4c69adcbb':
  Fix LOCAL_MODULE_HOST_OS
 2015-09-05 01:29:56 +00:00
Shinichiro Hamaji 909e7f40ae Use $(BUILD_MODULES_IN_PATHS) as a part of ninja suffix 
So that switching between two different mmma targets won't
need regenerating ninja files.

Change-Id: Ifddd75ec49abd3ab2a54c6afbb902b0b32359db8
 2015-09-05 09:00:19 +09:00
Dan Willemsen ed635cfc0d Fix LOCAL_MODULE_HOST_OS 
Make sure LOCAL_IS_HOST_MODULE is set before including
module_arch_supported.mk

Bug: 23566667
Change-Id: I28ef10f093407eb3a6a83574ecc3f098eb775241
 2015-09-04 15:41:38 -07:00
Ying Wang cbac87899b am af72e1b3: Merge "Move part of logtags stuff back to base_rules.mk." 
* commit 'af72e1b3e68f449c81054bc25e655016529914e1':
  Move part of logtags stuff back to base_rules.mk.
 2015-09-04 17:56:24 +00:00
Yasuhiro Matsuda ff82e82a1e Move part of logtags stuff back to base_rules.mk. 
Otherwise event tags for non-Java modules
(e.g. logcat, libsurfaceflinger) are not generated.

BUG: 23803975
Change-Id: I6fd53fe2ca39102787fc513aa8c23f906b94f253
 2015-09-04 20:02:49 +09:00
Dan Willemsen f18345af74 am 4379e2b8: Merge "Add LOCAL_MODULE_HOST_OS" 
* commit '4379e2b8bbaf2a02777f189c758e251015eb7f76':
  Add LOCAL_MODULE_HOST_OS
 2015-09-04 01:31:22 +00:00
Dan Willemsen 859ac34064 Add LOCAL_MODULE_HOST_OS 
Instead of wrapping a host module definition in 'ifeq($(HOST_OS),...)'
in the Android.mk files, define which hosts are supported using
LOCAL_MODULE_HOST_OS.

A blank LOCAL_MODULE_HOST_OS means that linux and darwin are supported.
A non-empty LOCAL_MODULE_HOST_OS lists the supported HOST_OSs.

Change-Id: I1e342d1908cfa00aef2c39c145b4f5f81c373bc6
 2015-09-03 16:40:51 -07:00
Ying Wang 119cec9a4a am 4e2f1903: Merge "Clean up Javac a little bit." 
* commit '4e2f190315759b4270ab414b9ff1e24a19521521':
  Clean up Javac a little bit.
 2015-09-02 21:18:38 +00:00
Ying Wang 4e2f190315 Merge "Clean up Javac a little bit." 2015-09-02 20:48:50 +00:00
Evgenii Stepanov d259ecd171 am 617770c1: Merge "Add AddressSanitizer linker flags for x86." 
* commit '617770c133330fc06070e97ce39bbf065c749c97':
  Add AddressSanitizer linker flags for x86.
 2015-09-02 20:18:12 +00:00
Ivan Krasin b83e171c8d Add AddressSanitizer linker flags for x86. 
This is the 1/4 change required to get AddressSanitizer
for Android x86 to work.

Change-Id: I848805af34fdd32a313c991504d6014f9b97ab88
 2015-09-02 11:59:45 -07:00
Ying Wang 447d69678e Clean up Javac a little bit. 
- Added GLOBAL_JAVAC_DEBUG_FLAGS and merge it to
  PRIVATE_JAVACFLAGS/PRIVATE_JACK_FLAGS to get rid of
  PRIVATE_JAVAC_DEBUG_FLAGS/PRIVATE_JACK_DEBUG_FLAGS.
- With Java rules out of base_rules.mk we can get rid
  of java_alternative_checked_module now.

Change-Id: I1a14716c785e3d49330a75044107662ce96a9307
 2015-09-02 10:04:18 -07:00
Shinichiro Hamaji 86de02120d am e1b9123d: Merge "Set --ninja_suffix based on make/mm/mmm targets" 
* commit 'e1b9123d51f20543fd13ebd611c9c2fe92ecaf9c':
  Set --ninja_suffix based on make/mm/mmm targets
 2015-09-02 00:04:45 +00:00
Shinichiro Hamaji bfd01872cb Set --ninja_suffix based on make/mm/mmm targets 
This fixes two issues:

- Switching make target didn't work well when the latter
  make target is not a subset of the first make target.
- Switching between m and mm/mmm forced build.ninja to be
  regenerated.

Bug: 23685536

Change-Id: I3c3550d6cca3007d166a13367d6bc22cc3feede2
 2015-09-02 07:37:39 +09:00
Shinichiro Hamaji 565b95fbb8 am ec8f9731: Merge "Show error message when resource limit too low for USE_GOMA=true" 
* commit 'ec8f973147c3eacb048dd486c9534562f0328303':
  Show error message when resource limit too low for USE_GOMA=true
 2015-09-01 16:37:44 +00:00
Dan Willemsen 883897ec16 am d0ae4796: Merge "Blacklist libc++ from windows host builds" 
* commit 'd0ae4796a10b9855a738c5f5c79e603cac30cb9f':
  Blacklist libc++ from windows host builds
 2015-09-01 16:37:42 +00:00
Ying Wang 9bf627422c resolved conflicts for merge of a15ae216 to stage-aosp-master 
Change-Id: I9c10cf2d10f4295d12edd490ff0f9482c1810bf8
 2015-09-01 09:31:56 -07:00
Shinichiro Hamaji ec8f973147 Merge "Show error message when resource limit too low for USE_GOMA=true" 2015-09-01 02:26:15 +00:00
Dan Willemsen d0ae4796a1 Merge "Blacklist libc++ from windows host builds" 2015-09-01 00:44:21 +00:00
Ying Wang 3351178fb8 Cleaned the outdated incrementaljavac. 
Nobody is using this feature and now we switched to jack.

Change-Id: I749b486eb347cbf3ee7b107565fc800eeb238c44
(cherry-picked from commit 90598cb70c)
 2015-08-29 11:08:02 -07:00
Shinichiro Hamaji b601d4b0e4 Show error message when resource limit too low for USE_GOMA=true 
This should be particularly helpful for Mac users, because the
default limits of Mac are too low.

Change-Id: I03f0f76a0707b4ce5ef9cddf5df6e3857a215996
 2015-08-29 12:01:51 +09:00
Ying Wang 956dcccf76 Move Java stuff out of base_rules.mk 
- Moved the target-only .aidl and .logtag rules to java.mk.
- Moved the .proto rules,  Java library dependency calculation,
  Java resource processing and Java-related
  target-specific and global variables setup to a new java_common.java,
  which is shared by both target and host Java modules.
- Minor cleanup for the moved code.

Bug: 23597357
Change-Id: Ic3eb72e26bb1a663e5739abe0a935f96b88bc352
 2015-08-28 17:17:19 -07:00
Elliott Hughes f04f391b5f am 4548e7f4: Merge "Remove AndroidConfig.h." 
* commit '4548e7f49dbec05c8b8187b0ea9e746fc47ec5d3':
  Remove AndroidConfig.h.
 2015-08-28 19:59:18 +00:00
Elliott Hughes 43146118aa Remove AndroidConfig.h. 
This change leaves soong references.

Change-Id: Iee32b6b97ad9711f69e999c9d01f01d71562b63f
 2015-08-28 10:31:28 -07:00
Dan Willemsen d174629951 am 57ff23b0: Merge "Add support for LOCAL_SRC_FILES_(host)_(arch)" 
* commit '57ff23b0ed02affce494d14d8a0f5e9e4717baf7':
  Add support for LOCAL_SRC_FILES_(host)_(arch)
 2015-08-28 03:49:02 +00:00
Dan Willemsen 399c59f3aa am d5deac8d: Merge "Add _(darwin|linux|windows)" 
* commit 'd5deac8db951ec0a1c9edd806ea1758b836f8c46':
  Add _(darwin|linux|windows)
 2015-08-28 03:49:01 +00:00
Dan Willemsen 85ac8d2a00 Add support for LOCAL_SRC_FILES_(host)_(arch) 
For boringssl, which has architecture specific host assembly files

Bug: 23566667

Change-Id: Ia4602d28e93a1b3d1400cf95417b5e446c5fb84b
 2015-08-28 03:38:43 +00:00
Dan Willemsen 7a5498568f Add _(darwin|linux|windows) 
So that we can support building both linux and windows binaries at the
same time on a linux host. This replaces the ifeq($(HOST_OS),...) checks
in Android.mk files.

Bug: 23566667

Change-Id: I693e11984e36d55bb6f09fa0d49bc485463e16fb
 2015-08-28 03:36:22 +00:00
Bart Sears 4535d7cb34 am c69aa42b: Merge "Set the Security Patch level for MNC" into mnc-dev 
* commit 'c69aa42b4331569814d23336412e6754a0495d65':
  Set the Security Patch level for MNC
 2015-08-26 03:47:52 +00:00
Ying Wang c9343c0bc3 am cf129c53: am a7eaf450: Merge "Dist the otatools package." 
* commit 'cf129c538266cdc5d185a945218e7f76aa22ca27':
  Dist the otatools package.
 2015-08-25 17:27:26 +00:00
Ying Wang cf129c5382 am a7eaf450: Merge "Dist the otatools package." 
* commit 'a7eaf450781483791b02241fd6ab62767d4d6f99':
  Dist the otatools package.
 2015-08-25 17:21:57 +00:00
Bart Sears 0bb3145b56 Set the Security Patch level for MNC 
MNC will include the security patches from the August OEM bulletin
which will have a patch date of September 1.

Bug: 23288951
Change-Id: Ia0f313bf35fa7af1efed1787006bfbb614bc8c29
 2015-08-24 23:22:20 -07:00
Ying Wang 267e957373 Dist the otatools package. 
Bug: 23495952
Change-Id: I1f61946580dd8ea29c3d5e1f4e859cc6d1f8554a
 2015-08-24 17:13:53 -07:00
Tom Cherry 00c9b1b323 am 2899727f: am bcbd4eb9: Merge "remove TARGET_PROVIDES_INIT_RC" 
* commit '2899727fd7c97729df11c59a4ebf76df73379a28':
  remove TARGET_PROVIDES_INIT_RC
 2015-08-24 23:35:17 +00:00
Tom Cherry 2899727fd7 am bcbd4eb9: Merge "remove TARGET_PROVIDES_INIT_RC" 
* commit 'bcbd4eb9fb9c82f35ca46cc9b976a59b6c1645d4':
  remove TARGET_PROVIDES_INIT_RC
 2015-08-24 23:28:34 +00:00
Tom Cherry 2df35aea43 remove TARGET_PROVIDES_INIT_RC 
Change-Id: I765b80d48333f54fb995e4ccfd77d38683c6cbb9
 2015-08-24 13:55:02 -07:00
Christopher Wiley 3f7c5424db am 2b2c9dff: am 4e719eaf: Merge "Change .dbus.xml extension to .dbus-xml" 
* commit '2b2c9dff35304c21ebe1e793a16443a882920f75':
  Change .dbus.xml extension to .dbus-xml
 2015-08-21 22:24:31 +00:00
Christopher Wiley 2b2c9dff35 am 4e719eaf: Merge "Change .dbus.xml extension to .dbus-xml" 
* commit '4e719eafc4d183dd923518cea6292f37ee1e26c6':
  Change .dbus.xml extension to .dbus-xml
 2015-08-21 20:51:11 +00:00
Christopher Wiley 4e719eafc4 Merge "Change .dbus.xml extension to .dbus-xml" 2015-08-21 20:46:21 +00:00
Shinichiro Hamaji 8a0607f069 am b3cd0a56: am 39c7d243: Merge "Use goma when USE_GOMA=true is set" 
* commit 'b3cd0a566391726a69d9f0e439268f4caf5df7db':
  Use goma when USE_GOMA=true is set
 2015-08-21 03:36:12 +00:00
Shinichiro Hamaji b3cd0a5663 am 39c7d243: Merge "Use goma when USE_GOMA=true is set" 
* commit '39c7d243395ad3f2015571aaf902dc4d4686e981':
  Use goma when USE_GOMA=true is set
 2015-08-21 03:29:49 +00:00
Shinichiro Hamaji 39c7d24339 Merge "Use goma when USE_GOMA=true is set" 2015-08-21 03:24:27 +00:00
Elliott Hughes dc289ce17c am 344c3394: am 6f534125: Merge "Fix Linux host checkbuilds." 
* commit '344c33949b48ec5f3d27bff36f145f157156cf19':
  Fix Linux host checkbuilds.
 2015-08-21 00:11:53 +00:00
Elliott Hughes 344c33949b am 6f534125: Merge "Fix Linux host checkbuilds." 
* commit '6f5341259c6b6684acb4e91d9220593c231abecd':
  Fix Linux host checkbuilds.
 2015-08-21 00:05:12 +00:00
Elliott Hughes 6f5341259c Merge "Fix Linux host checkbuilds." 2015-08-20 23:56:07 +00:00
Elliott Hughes ac9eea9463 Fix Linux host checkbuilds. 
Turns out that thanks to 9d59f41776 we actually
build *all* the host libraries both 32- and 64-bit. Rather than fix the
libraries (or fixing things so we don't build stuff we don't need) right now,
let's just put _FILE_OFFSET_BITS and _LARGEFILE_SOURCE back.

Change-Id: I6c2d6a6919d1518f775e0d6c050e2c774994c5bd
 2015-08-20 16:52:47 -07:00
Elliott Hughes 158800c9ed am 30a18bca: am a3fa59b1: Merge "Kill host Linux AndroidConfig.h." 
* commit '30a18bca6222065d15e1b18d71a29a8fb921d4a8':
  Kill host Linux AndroidConfig.h.
 2015-08-20 23:20:21 +00:00
Elliott Hughes 30a18bca62 am a3fa59b1: Merge "Kill host Linux AndroidConfig.h." 
* commit 'a3fa59b12b7346b3d0fbb8c60f890e50c7f51f18':
  Kill host Linux AndroidConfig.h.
 2015-08-20 23:14:41 +00:00
Elliott Hughes a3fa59b12b Merge "Kill host Linux AndroidConfig.h." 2015-08-20 23:10:05 +00:00
Elliott Hughes b4ec57c016 am 00da9ced: am ded991b4: Merge "Revert "Fix Windows SDK build."" 
* commit '00da9cede0b4199d3b6dea73b61afa8610b5c339':
  Revert "Fix Windows SDK build."
 2015-08-20 21:54:58 +00:00
Elliott Hughes 7f45f953ad am 0049aecf: am a6065996: Merge "Stop defining WIN32." 
* commit '0049aecf1763ea939cdf91e4e70fda67eb2efbee':
  Stop defining WIN32.
 2015-08-20 21:54:57 +00:00
Elliott Hughes 00da9cede0 am ded991b4: Merge "Revert "Fix Windows SDK build."" 
* commit 'ded991b47d0235bd505b5d95e438118d0b7f1041':
  Revert "Fix Windows SDK build."
 2015-08-20 21:43:17 +00:00
Elliott Hughes 0049aecf17 am a6065996: Merge "Stop defining WIN32." 
* commit 'a6065996cd280acf11f199c1f90e1b8886635207':
  Stop defining WIN32.
 2015-08-20 21:43:16 +00:00
Elliott Hughes ded991b47d Merge "Revert "Fix Windows SDK build."" 2015-08-20 21:23:59 +00:00
Elliott Hughes 73042ea0c7 Revert "Fix Windows SDK build." 
This reverts commit b8dd176441.

This wasn't the problem, and mingw doesn't even use _LARGEFILE_SOURCE. The real problem (using WIN32 instead of _WIN32 in external/llvm) is fixed now.

Change-Id: I2b708a006b530cb18d03b1425cd65edda35ee17e
 2015-08-20 21:22:19 +00:00
Elliott Hughes a6065996cd Merge "Stop defining WIN32." 2015-08-20 21:21:01 +00:00
Elliott Hughes f0c04c7b2e Stop defining WIN32. 
Change-Id: Iac0b4745579e6de55bea02571617ae561308e1a9
 2015-08-20 14:04:18 -07:00
Ying Wang 4270d91bbe am 8a3241e3: am 11a38e7a: Merge "Support LOCAL_INIT_RC." 
* commit '8a3241e39ad541666aeff291b088e7277b5519ca':
  Support LOCAL_INIT_RC.
 2015-08-20 21:00:07 +00:00
Ying Wang 8a3241e39a am 11a38e7a: Merge "Support LOCAL_INIT_RC." 
* commit '11a38e7a9164bc3268344ce716c4bd12b08cb05c':
  Support LOCAL_INIT_RC.
 2015-08-20 20:53:32 +00:00
Ying Wang 11a38e7a91 Merge "Support LOCAL_INIT_RC." 2015-08-20 20:47:53 +00:00
Elliott Hughes 59b3bd27a0 am 896d0ee2: am 999fd4ea: Merge "Also -DWIN32 to keep llvm building." 
* commit '896d0ee2cf123f045af859d7291dba65a0b7d789':
  Also -DWIN32 to keep llvm building.
 2015-08-20 19:32:39 +00:00
Elliott Hughes 29e8a32972 am 9f9d2aed: am 79b199b8: Merge "Fix Windows SDK build." 
* commit '9f9d2aedf4e28f0dec1568347ac6a052cdca12b9':
  Fix Windows SDK build.
 2015-08-20 19:32:34 +00:00
Elliott Hughes a65473b0e7 am 896b9c60: am 57069e59: Merge "Remove Windows AndroidConfig.h." 
* commit '896b9c603938220ea40f75a07aef8ec1a0664f37':
  Remove Windows AndroidConfig.h.
 2015-08-20 19:32:30 +00:00
Shinichiro Hamaji 5047933993 am 9e7efdf3: am e7d6f04d: Merge "Add two flags for the latest ckati" 
* commit '9e7efdf3e659c2de002b96ec27589f12c1f01512':
  Add two flags for the latest ckati
 2015-08-20 19:31:56 +00:00
Dan Albert a8803f0b3c am 54e0b7de: am 6b966aff: Merge "Fix sanitizer choice for global vs module." 
* commit '54e0b7de2ba60b8c769b985be397317790dcfd75':
  Fix sanitizer choice for global vs module.
 2015-08-20 19:31:54 +00:00
Ying Wang 9fe15ac757 Support LOCAL_INIT_RC. 
A module can install a companion init.rc file,
by specifying:
LOCAL_INIT_RC := <init.rc-file-path-replative-to-LOCAL_PATH>
You can also use the variant with _32 or _64 suffix.

Bug: 23186545
Change-Id: I00a96509f5707ae39361a0c5555fa59d46c90322
 2015-08-20 12:15:15 -07:00
Elliott Hughes 896d0ee2cf am 999fd4ea: Merge "Also -DWIN32 to keep llvm building." 
* commit '999fd4ea850b494f38ac23195ad5c2ee0b9486a2':
  Also -DWIN32 to keep llvm building.
 2015-08-20 18:18:50 +00:00
Elliott Hughes e31dfe965f Kill host Linux AndroidConfig.h. 
We only build 64-bit now anyway.

Change-Id: I4bc9487522d215234509510bee66e4f210d86765
 2015-08-20 11:14:23 -07:00
Elliott Hughes 0823ad3300 Also -DWIN32 to keep llvm building. 
Change-Id: Ic8e70f35dda23226d60010a38cf5633840772310
 2015-08-20 11:10:22 -07:00
Elliott Hughes 9f9d2aedf4 am 79b199b8: Merge "Fix Windows SDK build." 
* commit '79b199b80e98ff7d0340de8c55f0da6d085e9ef8':
  Fix Windows SDK build.
 2015-08-20 17:26:50 +00:00
Elliott Hughes b8dd176441 Fix Windows SDK build. 
I forgot that removing a file doesn't cause a rebuild in our lame build
system, so I hadn't actually tested my previous change.

Change-Id: Ida19d4a8fd40e37029031eac4b4ca5f0cc5c895b
 2015-08-20 10:19:26 -07:00
Elliott Hughes 896b9c6039 am 57069e59: Merge "Remove Windows AndroidConfig.h." 
* commit '57069e5974c3224550c3cf3a12dbe6ffac4b0c79':
  Remove Windows AndroidConfig.h.
 2015-08-20 17:06:48 +00:00
Elliott Hughes 57069e5974 Merge "Remove Windows AndroidConfig.h." 2015-08-20 16:59:03 +00:00
Elliott Hughes f8241b41d5 Remove Windows AndroidConfig.h. 
The only things left that we're using are the Windows target version
and _FILE_OFFSET_BITS=64, and they can go in the combo .mk.

Also fix the unused Windows 64 .mk.

Change-Id: I5f2458d67c0a8201196a339573f861bbf18b7eb8
 2015-08-20 09:56:52 -07:00
Christopher Wiley 9b17dea308 Change .dbus.xml extension to .dbus-xml 
Work around gyp's inability to handle compound extensions by expecting
a similar looking simple extension for XML files definine DBus
interfaces.  We'll need to rename these sources in the places we're
using them already.

Bug: 23380180
Change-Id: Ieb2050f3ef05456cd70de65c3e128d57a6a508f8
 2015-08-20 09:36:08 -07:00
Shinichiro Hamaji ee482fd521 Use goma when USE_GOMA=true is set 
With USE_GOMA, the path to gomacc in $GOMA_DIR or $HOME/goma
will be appended to CC_WRAPPER and CXX_WRAPPER.

Note this works only with USE_NINJA. Unlike ninja, GNU make
cannot change the parallelism depending on targets. Specifying
-j500 to GNU make would mean you may run 500 local jobs in
parallel, but with -j32 goma will just slow down the build.

Change-Id: I0f571454fd2a5b525ee29b445f7ab8715927ca00
 2015-08-20 14:33:44 +09:00
Shinichiro Hamaji 9e7efdf3e6 am e7d6f04d: Merge "Add two flags for the latest ckati" 
* commit 'e7d6f04d32c26e1355a1a01008941477c1432611':
  Add two flags for the latest ckati
 2015-08-20 05:31:30 +00:00
Shinichiro Hamaji e7d6f04d32 Merge "Add two flags for the latest ckati" 2015-08-20 05:25:34 +00:00
Dan Albert 54e0b7de2b am 6b966aff: Merge "Fix sanitizer choice for global vs module." 
* commit '6b966aff43fc4d80b8f35ef2a333107f68ac2be0':
  Fix sanitizer choice for global vs module.
 2015-08-20 05:13:56 +00:00
Dan Albert 4c40141a91 Fix sanitizer choice for global vs module. 
The sanitizer chosen by the environment (either by SANITIZE_TARGET or
SANITIZE_HOST) should be chosen over the one specified by the module.

Bug: http://b/23330588
Change-Id: I835b7d76e071fc0db2f859f98dfb9d7ff76af245
 2015-08-19 20:24:23 -07:00
Elliott Hughes 33a1439796 am 088849e2: am b3c585d7: Merge "Stop defining HAVE_MS_C_RUNTIME." 
* commit '088849e24da28e398179cd915f142ca4224e6888':
  Stop defining HAVE_MS_C_RUNTIME.
 2015-08-19 22:31:13 +00:00
Christopher Wiley 5bc62fdc65 am 7db39448: am 9e3b4ed4: Merge "Fix DBus proxies to use all definitions" 
* commit '7db39448409ef9797089774ca8e196142662b0f2':
  Fix DBus proxies to use all definitions
 2015-08-19 22:31:10 +00:00
Christopher Wiley 9c49f0affa am 688b4a3d: am 4d2b79f9: Merge "Generate DBus proxies and adaptors separately" 
* commit '688b4a3db72b58e8908ecdb24e6c4d64a44fdbc6':
  Generate DBus proxies and adaptors separately
 2015-08-19 22:31:03 +00:00
Elliott Hughes 088849e24d am b3c585d7: Merge "Stop defining HAVE_MS_C_RUNTIME." 
* commit 'b3c585d745918bebb6e4ea72ad60875adf53337e':
  Stop defining HAVE_MS_C_RUNTIME.
 2015-08-19 22:18:33 +00:00
Elliott Hughes b3c585d745 Merge "Stop defining HAVE_MS_C_RUNTIME." 2015-08-19 22:09:32 +00:00
Christopher Wiley 7db3944840 am 9e3b4ed4: Merge "Fix DBus proxies to use all definitions" 
* commit '9e3b4ed4991eb19e60346858bfdbb494d9324252':
  Fix DBus proxies to use all definitions
 2015-08-19 21:47:27 +00:00
Elliott Hughes 19fa8413ed Stop defining HAVE_MS_C_RUNTIME. 
Change-Id: Ie491547552ba64d60d669b74115da96a0fcced18
 2015-08-19 14:22:59 -07:00
Christopher Wiley 974b82259a Fix DBus proxies to use all definitions 
Bug: 22608897
Change-Id: Id17cf4b896c1c62be874599c7f346f3045e36819
 2015-08-19 13:48:53 -07:00
Christopher Wiley 688b4a3db7 am 4d2b79f9: Merge "Generate DBus proxies and adaptors separately" 
* commit '4d2b79f99ef34a504fe9f7e362a861d7ddee5659':
  Generate DBus proxies and adaptors separately
 2015-08-19 18:37:48 +00:00
Christopher Wiley 4d2b79f99e Merge "Generate DBus proxies and adaptors separately" 2015-08-19 18:30:20 +00:00
Christopher Wiley 529f176ee1 Generate DBus proxies and adaptors separately 
Enable daemons exposing an interface over DBus to easily
build client libraries.  Now daemons can write rules like:

include $(CLEAR_VARS)
LOCAL_MODULE := libdbus-binding-example-client
LOCAL_DBUS_PROXY_PREFIX := dbus-example-example
LOCAL_SRC_FILES := \
    dbus_bindings/org.chromium.Example.Manager.dbus.xml \
    dbus_bindings/dbus-service-config.json
include $(BUILD_SHARED_LIBRARY)

to expose a client library.

While here, add support for generating independent adaptor header
files on a per interface basis.

Bug: 22608897
Change-Id: I011f9afc234811c31e445898321c2731c482fa77
 2015-08-19 11:14:16 -07:00
Tao Bao 42a2b83c53 am d88eaf02: am 123a7d38: Merge "build: Don\'t call make_recovery_patch if there\'s no recovery." 
* commit 'd88eaf025543c3e5360fb22f1d142133621b117e':
  build: Don't call make_recovery_patch if there's no recovery.
 2015-08-19 02:46:41 +00:00
Tao Bao d88eaf0255 am 123a7d38: Merge "build: Don\'t call make_recovery_patch if there\'s no recovery." 
* commit '123a7d380ee29941639a1fce10ba2051d37f860b':
  build: Don't call make_recovery_patch if there's no recovery.
 2015-08-19 02:39:21 +00:00
Dan Willemsen 1ca3b70f84 Blacklist libc++ from windows host builds 
It's not ready, and instead of each Android.mk doing this, do it in the
core build.

Change-Id: Ie80b17ffcde64e72c98d310ca986d4cf775c099e
 2015-08-18 19:08:45 -07:00
Tao Bao cbc6dc29d6 build: Don't call make_recovery_patch if there's no recovery. 
Change-Id: Iea1bd529eca9cd607da3b420bc4287f95c18219d
 2015-08-18 18:28:47 -07:00
Chih-hung Hsieh 2cc00c305c am 3eccd047: am 59c858fc: Merge "Remove special x86 flag that disables tail call optimization." 
* commit '3eccd04784d4a92e224bf0e6917f9a3b0353da1d':
  Remove special x86 flag that disables tail call optimization.
 2015-08-18 22:22:23 +00:00
Chih-hung Hsieh 3eccd04784 am 59c858fc: Merge "Remove special x86 flag that disables tail call optimization." 
* commit '59c858fc94d4cf45a260da81176372ca2a4b77ef':
  Remove special x86 flag that disables tail call optimization.
 2015-08-18 22:17:31 +00:00
Chih-hung Hsieh 59c858fc94 Merge "Remove special x86 flag that disables tail call optimization." 2015-08-18 22:11:03 +00:00
Ying Wang 71327b90d8 am 42fa1948: Merge "Rename libnanopb-c-2.8.0 to libprotobuf-c-nano." 
* commit '42fa19482abbcebcb2ab563084b7ac1969553fe9':
  Rename libnanopb-c-2.8.0 to libprotobuf-c-nano.
 2015-08-18 21:41:05 +00:00
Ying Wang f526c169ef am c3dcb6c0: Merge "Consolidate the nanopb-c and regular protobuf build rules." 
* commit 'c3dcb6c06bd2fbe816a918e9c3b099669bbeb5b5':
  Consolidate the nanopb-c and regular protobuf build rules.
 2015-08-18 21:41:03 +00:00
Ying Wang 42fa19482a Merge "Rename libnanopb-c-2.8.0 to libprotobuf-c-nano." 2015-08-18 21:35:42 +00:00
Ying Wang c3dcb6c06b Merge "Consolidate the nanopb-c and regular protobuf build rules." 2015-08-18 21:35:37 +00:00
Ying Wang f050c2f1c7 Rename libnanopb-c-2.8.0 to libprotobuf-c-nano. 
Bug: 20093047
Change-Id: I787925fde97d1a3965cb8a9bf012f3c5a45a6aed
 2015-08-18 14:32:07 -07:00
Ying Wang b28ed234aa Consolidate the nanopb-c and regular protobuf build rules. 
Bug: 20093047
Change-Id: I38ebd748aacce6d215403da481ad04833810a995
 2015-08-18 14:27:45 -07:00
Dan Willemsen 1b14846717 am 48d95e75: am 05d97fe7: Merge "Remove legacy windows platform build support" 
* commit '48d95e752536dc7a81c141e435e8a90b7929cf02':
  Remove legacy windows platform build support
 2015-08-18 04:43:04 +00:00
Dan Willemsen 48d95e7525 am 05d97fe7: Merge "Remove legacy windows platform build support" 
* commit '05d97fe723ea376edb5fe6b12535485311a32418':
  Remove legacy windows platform build support
 2015-08-18 04:37:09 +00:00
Dan Willemsen 05d97fe723 Merge "Remove legacy windows platform build support" 2015-08-18 04:31:07 +00:00
Dan Willemsen 9cf990beec resolved conflicts for merge of 05fae7e0 to mnc-dev-plus-aosp 
Change-Id: I9f0f1169839afabc7ec7e439b668798e2cd111a3
 2015-08-17 20:50:48 -07:00
Dan Willemsen 05fae7e0be am e6510750: Merge "Use repeatable timestamps" 
* commit 'e65107508adbea88fcc1ec51dcf28d4216365753':
  Use repeatable timestamps
 2015-08-18 03:35:44 +00:00
Dan Willemsen e65107508a Merge "Use repeatable timestamps" 2015-08-18 03:30:11 +00:00
Ying Wang f4ff2b119c am 808f0541: am 77128117: Merge "Set up dependency on ADDRESS_SANITIZER_LINKER" 
* commit '808f0541bba725c4fdc9d2b425a305eeeb024e39':
  Set up dependency on ADDRESS_SANITIZER_LINKER
 2015-08-18 00:18:48 +00:00
Ying Wang 808f0541bb am 77128117: Merge "Set up dependency on ADDRESS_SANITIZER_LINKER" 
* commit '77128117d8b7811b86ba89e963f8a96cc6c55a6b':
  Set up dependency on ADDRESS_SANITIZER_LINKER
 2015-08-18 00:11:11 +00:00
Ying Wang a05e222368 Set up dependency on ADDRESS_SANITIZER_LINKER 
Set up dependency on ADDRESS_SANITIZER_LINKER if address sanitizer is
enabled.

Bug: 22850550
Change-Id: I736fe1d4db9594edf9e82ae96e4631887881dfa5
 2015-08-17 17:06:14 -07:00
Dan Albert c0ad316183 am 9496ef90: am c0018b04: Merge "Add BUILD(_HOST)?_FUZZ_TEST." 
* commit '9496ef903ff9402859ac82cc339708c15fcd30f6':
  Add BUILD(_HOST)?_FUZZ_TEST.
 2015-08-17 22:46:38 +00:00
Dan Albert 9496ef903f am c0018b04: Merge "Add BUILD(_HOST)?_FUZZ_TEST." 
* commit 'c0018b04e984180122ab615d8dbea09a3230ef7f':
  Add BUILD(_HOST)?_FUZZ_TEST.
 2015-08-17 22:39:25 +00:00
Dan Albert 36b6f0472f Add BUILD(_HOST)?_FUZZ_TEST. 
These are tests that use LLVM's libFuzzer for testing with a
sanitizer.

Bug: http://b/22850550
Change-Id: I6eeaff7877b7dd0c30f8910c6f27f5278b27a83d
 2015-08-17 14:39:27 -07:00
Dan Albert 401faa3513 am 8d61be6c: am f9b75b1b: Merge "Don\'t filter on a non-existent variable." 
* commit '8d61be6c781277ae3f5423c805092220a961b102':
  Don't filter on a non-existent variable.
 2015-08-17 20:24:05 +00:00
Dan Albert 8d61be6c78 am f9b75b1b: Merge "Don\'t filter on a non-existent variable." 
* commit 'f9b75b1b24d985c873e548d4fd7945a6cdd99323':
  Don't filter on a non-existent variable.
 2015-08-17 20:19:30 +00:00
Dan Willemsen 145ae32069 Remove legacy windows platform build support 
We still support HOST_OS=windows for the SDK host tools cross-builds, but
that's only when USE_MINGW is set when running under linux.

Change-Id: I37da87dc9fbbd69ba10ce4d7f2668ab3f6482d92
 2015-08-17 12:35:04 -07:00
Dan Albert 1b2187d871 Don't filter on a non-existent variable. 
This used to be used for aarch64
(https://android-review.googlesource.com/#/c/80126/), but has since
been removed and now does nothing. This was then reimplemented more
generally with my_illegal_flags
(https://android-review.googlesource.com/#/c/166405/). Drop
*GLOBAL_UNSUPPORTED_CFLAGS in favor of that.

Change-Id: I3347726dd92f9d3a16783e0d9d3b685a828400b4
 2015-08-17 10:36:09 -07:00
Shinichiro Hamaji 5b6b6bb974 Add two flags for the latest ckati 
* --regen

Re-generate build.ninja only when necessary. If either

1. .mk file is updated,
2. environment variable is updated,
3. $(wildcard) result is changed, or
4. $(shell) result is changed,

ckati will regenerate ninja file. This check takes only ~1
second, so incremental build will become much faster even
without "fastincremental" target.

* --ignore_dirty=out/%:

Some .mk files in out/ (e.g.,
out/target/product/generic/previous_build_config.mk)
are updated while ckati is running. With this flag, ckati
does not regenerate build.ninja when they look modified.
This should be OK for ninja based build, as ninja handles
command line changes nicely.

Change-Id: I7a2fca0e327d999599d6b16f06358e8a5e657565
 2015-08-17 20:20:20 +09:00
Stephen Hines 7b6af490e9 am 5d17a7e2: am 2e08cb6e: Merge "Add -mfpu=neon-vfpv4 if cpu is krait" 
* commit '5d17a7e2adf505fd7a97782f54856c86a237369d':
  Add -mfpu=neon-vfpv4 if cpu is krait
 2015-08-15 02:18:58 +00:00
Yang Ni 9d1eaaea61 am dcfb0c80: am 36600a6b: Merge "Include target api version in build system for rscpp." 
* commit 'dcfb0c8018ec9e81fa79f3251a3d49a4cc90ddf4':
  Include target api version in build system for rscpp.
 2015-08-15 02:18:57 +00:00
Stephen Hines 5d17a7e2ad am 2e08cb6e: Merge "Add -mfpu=neon-vfpv4 if cpu is krait" 
* commit '2e08cb6e1bf90b0950c875132d2bf37b71d03fbb':
  Add -mfpu=neon-vfpv4 if cpu is krait
 2015-08-15 02:12:46 +00:00
Stephen Hines 2e08cb6e1b Merge "Add -mfpu=neon-vfpv4 if cpu is krait" 2015-08-15 02:04:55 +00:00
Yang Ni dcfb0c8018 am 36600a6b: Merge "Include target api version in build system for rscpp." 
* commit '36600a6bf9b3b79327785cd740a909d3920d6519':
  Include target api version in build system for rscpp.
 2015-08-14 18:46:18 +00:00
Yang Ni 36600a6bf9 Merge "Include target api version in build system for rscpp." 2015-08-14 18:39:47 +00:00
Dan Albert 7911f1b1aa am 5e9f4912: am 578acca4: Merge "Link librt on the host when using sanitizers." 
* commit '5e9f491218721adecfab6ea0178cd1e4c6723a87':
  Link librt on the host when using sanitizers.
 2015-08-14 01:10:46 +00:00
Dan Albert 5e9f491218 am 578acca4: Merge "Link librt on the host when using sanitizers." 
* commit '578acca4e27511900eefc2f65be3e88f9127660c':
  Link librt on the host when using sanitizers.
 2015-08-14 01:05:03 +00:00
Dan Albert 578acca4e2 Merge "Link librt on the host when using sanitizers." 2015-08-14 00:59:52 +00:00
Dan Albert 2922411446 Link librt on the host when using sanitizers. 
The sanitizers now use shared memory.

Change-Id: Ie8fa6690374eda08ee4138b68fd628ebbfa2d0c8
 2015-08-13 17:25:10 -07:00
Noah Presler 4796a8c524 Include target api version in build system for rscpp. 
b/23161320

Change-Id: Ibc23309abed092e7648168fbf4b80891a44929a6
 2015-08-13 17:07:56 -07:00
Chris Banes 0fd694f360 am 743938fb: Merge "Make sure only AppCompat (not it\'s tests) are in the docs" into mnc-dev 
* commit '743938fb0d4f56d7d009486fb90891eab9b50897':
  Make sure only AppCompat (not it's tests) are in the docs
 2015-08-13 17:36:54 +00:00
Dan Albert dc0e7244a6 am 2c00d629: am 727b462a: Merge "Never allow -w." 
* commit '2c00d62940e7f88b2168ccf3a29a1d3e84f59bfa':
  Never allow -w.
 2015-08-13 17:02:13 +00:00
Dan Albert 2c00d62940 am 727b462a: Merge "Never allow -w." 
* commit '727b462a92635665ce636c63123078a970654480':
  Never allow -w.
 2015-08-13 16:52:55 +00:00
Dan Albert 727b462a92 Merge "Never allow -w." 2015-08-13 16:48:18 +00:00
Neil Fuller 53d1632681 am 5f198440: am bc7680c4: Merge "Include the okhttp.jar when compiling against internal classes" 
* commit '5f19844067af27906828af7caed8e8b9c09cac4a':
  Include the okhttp.jar when compiling against internal classes
 2015-08-13 10:51:04 +00:00
Neil Fuller 5f19844067 am bc7680c4: Merge "Include the okhttp.jar when compiling against internal classes" 
* commit 'bc7680c4d7a94cfafcc3c925f0fbf134bc1dfcb8':
  Include the okhttp.jar when compiling against internal classes
 2015-08-13 10:46:46 +00:00
Neil Fuller bc7680c4d7 Merge "Include the okhttp.jar when compiling against internal classes" 2015-08-13 10:40:39 +00:00
Chris Banes b916a5bcbc Make sure only AppCompat (not it's tests) are in the docs 
BUG: 23169683

Change-Id: I6ab3b8c89eba17920f1265021c7960819e4371ab
 2015-08-13 10:42:02 +01:00
Dianne Hackborn 42ebdfc574 am 25abc5a3: Merge "Fix issie #23116383: Include security patch level in Settings" into mnc-dev 
* commit '25abc5a38e2e7f2962463aa4e5cd407ecdde689c':
  Fix issie #23116383: Include security patch level in Settings
 2015-08-13 00:53:51 +00:00
Dianne Hackborn 25abc5a38e Merge "Fix issie #23116383: Include security patch level in Settings" into mnc-dev 2015-08-13 00:46:58 +00:00
Nick Kralevich 420662b9cd am c85364c9: am 5f79bcdd: Merge changes from topic \'file_contexts.bin\' 
* commit 'c85364c9c91961461a6d81a37c8b30b34b02383b':
  build: switch over to file_contexts.bin only
  Update embedded.mk to support file_contexts.bin
 2015-08-13 00:00:36 +00:00
Nick Kralevich c85364c9c9 am 5f79bcdd: Merge changes from topic \'file_contexts.bin\' 
* commit '5f79bcdd070f4069cd60bbe68430ee172575f9e2':
  build: switch over to file_contexts.bin only
  Update embedded.mk to support file_contexts.bin
 2015-08-12 23:53:50 +00:00
Nick Kralevich 5f79bcdd07 Merge changes from topic 'file_contexts.bin' 
* changes:
  build: switch over to file_contexts.bin only
  Update embedded.mk to support file_contexts.bin
 2015-08-12 23:46:28 +00:00
Dianne Hackborn e593e5c42a Fix issie #23116383: Include security patch level in Settings 
Change-Id: I46303c064d1365781a2c8a05bd6087518afb2aec
 2015-08-12 16:29:08 -07:00
Dan Albert df3fd1d128 Never allow -w. 
Apparently -w will disable all warnings on GCC regardless of ordering
(clang will still respect ordering so warnings that are enabled after
-w are still respected). This is insane. Strip -w from the cflags.
Anyone that wants this flag should be turning off the specific
warnings (or just fix them), not disabling all warnings.

Change-Id: I2ba065637dfdc192921da4d9adbdc63b728c166f
 2015-08-12 14:54:16 -07:00
Neil Fuller f39a25bc28 Include the okhttp.jar when compiling against internal classes 
If LOCAL_SDK_VERSION is unset we were compiling against
core-libart but not okhttp.

okhttp should be an implementation detail but
android.net.http.HttpResponseCache implements
com.android.okhttp.OkCacheContainer.

The OpenJDK 8 version of of javac now requires all interfaces of
implemented classes be made available at compile time even with
-source 1.7 -target 1.7.

This is not an issue when compiling against the android.jar because
the implementation of HttpResponseCache in the android.jar does not
implement com.android.okhttp.OkCacheContainer.

Bug: 23099154
Change-Id: I3fa1d0f73535b396623fed953cfc71189b797849
 2015-08-12 09:30:58 +01:00