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
1205f2d953
am f18345af
: am 4379e2b8
: Merge "Add LOCAL_MODULE_HOST_OS"
...
* commit 'f18345af74ad00d057adad89b1d154471ebf118f':
Add LOCAL_MODULE_HOST_OS
2015-09-04 01:39:49 +00: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
Zach Jang
ea9ea8fafb
am cf7e78cc
: am 36890dac
: am 9f7c3781
: am 057831bc
: Merge "Set the Security Patch level with Oct 1 for MNC" into mnc-dev
...
* commit 'cf7e78cca06b3edc17270eb3bf6715126afd98da':
Set the Security Patch level with Oct 1 for MNC
2015-09-03 04:23:44 +00:00
Ying Wang
08f82e9b33
am 119cec9a
: am 4e2f1903
: Merge "Clean up Javac a little bit."
...
* commit '119cec9a4a8792d6c5efd5f126d8c8e3fd7f90d5':
Clean up Javac a little bit.
2015-09-02 21:29:53 +00: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
cfa73b45c2
am d259ecd1
: am 617770c1
: Merge "Add AddressSanitizer linker flags for x86."
...
* commit 'd259ecd171ad9a7d85d0ba44669fcb62bde342ae':
Add AddressSanitizer linker flags for x86.
2015-09-02 20:23:26 +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
a7216a683c
am 86de0212
: am e1b9123d
: Merge "Set --ninja_suffix based on make/mm/mmm targets"
...
* commit '86de02120dbda1a11d5ad05b55debcf05b55131e':
Set --ninja_suffix based on make/mm/mmm targets
2015-09-02 00:15:51 +00: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
Zach Jang
9f7c37811b
am 057831bc
: Merge "Set the Security Patch level with Oct 1 for MNC" into mnc-dev
...
* commit '057831bc665b15d7beda970b91b2c332dee417f0':
Set the Security Patch level with Oct 1 for MNC
2015-09-02 00:04:40 +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
Tao Bao
ccad82c52e
Merge "Revert "Temporarily use blockimgdiff v2 for OTA."" into mnc-dr-dev
2015-09-01 19:02:24 +00:00
Shinichiro Hamaji
fd69b5582e
am 565b95fb
: am ec8f9731
: Merge "Show error message when resource limit too low for USE_GOMA=true"
...
* commit '565b95fbb8363652955ef3ecdd1bf122c3f0afbd':
Show error message when resource limit too low for USE_GOMA=true
2015-09-01 16:43:50 +00:00
Dan Willemsen
99713d6935
am 883897ec
: am d0ae4796
: Merge "Blacklist libc++ from windows host builds"
...
* commit '883897ec16ba0ce2adbae5a82ceb75279f67e765':
Blacklist libc++ from windows host builds
2015-09-01 16:43:49 +00:00
Ying Wang
3ead0a7b57
am 9bf62742
: resolved conflicts for merge of a15ae216
to stage-aosp-master
...
* commit '9bf627422c33102b4a06eebf5d1884490faae8c7':
Move Java stuff out of base_rules.mk
2015-09-01 16:43:46 +00: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
Zach Jang
4d034675f0
Set the Security Patch level with Oct 1 for MNC
...
- MNC currently has security patches from the August OEM bulletin with patch date of Sep 1 plus only critical fixes from September OEM bulletin
- To be cherry-picked if picking up remaining fixes from September OEM bulletin to MNC
Change-Id: I2d1ba9c5a893727962f3f1837df1dd9df49e44f5
2015-08-31 10:12:17 -07: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
f06a2d3b63
am f04f391b
: am 4548e7f4
: Merge "Remove AndroidConfig.h."
...
* commit 'f04f391b5f036563f71aa0c1805dc86c09137e98':
Remove AndroidConfig.h.
2015-08-28 20:07:13 +00: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
c222a10d06
am d1746299
: am 57ff23b0
: Merge "Add support for LOCAL_SRC_FILES_(host)_(arch)"
...
* commit 'd174629951530d183015d7f124c993dac9da46aa':
Add support for LOCAL_SRC_FILES_(host)_(arch)
2015-08-28 03:55:06 +00:00
Dan Willemsen
00cf9d5008
am 399c59f3
: am d5deac8d
: Merge "Add _(darwin|linux|windows)"
...
* commit '399c59f3aa3b7f025a8ec5b0b60af402f9954142':
Add _(darwin|linux|windows)
2015-08-28 03:55:05 +00: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
Ying Wang
d0cc11e898
am 8f7c08ed
: am 1e120181
: am 473b6a5f
: am fc028e59
: Dist the otatools package.
...
* commit '8f7c08ed622d733c0997324d5b0464ba7e57c1fa':
Dist the otatools package.
2015-08-27 01:37:53 +00:00
Ying Wang
8f7c08ed62
am 1e120181
: am 473b6a5f
: am fc028e59
: Dist the otatools package.
...
* commit '1e120181f0a9240eca61dface4fb4530bf2594ab':
Dist the otatools package.
2015-08-27 01:27:37 +00:00
Tao Bao
7540c08807
Revert "Temporarily use blockimgdiff v2 for OTA."
...
This reverts commit d07bfc5196
.
Real fixes [1][2][3] are ready to merge. Time to revert the workaround.
[1] commit d47d8e1488
[2] commit 1fc67631ee
[3] commit 937847ae49
Bug: 22430577
Change-Id: Icd6623e8717c93ad1f12cd1ba43db5e006e928ad
2015-08-26 15:29:00 -07:00
Ying Wang
1e120181f0
am 473b6a5f
: am fc028e59
: Dist the otatools package.
...
* commit '473b6a5f2b00f941acb08b5c3df59cbbdf647609':
Dist the otatools package.
2015-08-26 20:17:16 +00:00
Bart Sears
b0eed1a70e
am e23a407b
: am 8239d21b
: am 8a1fa158
: am c69aa42b
: Merge "Set the Security Patch level for MNC" into mnc-dev
...
* commit 'e23a407b2d3153268b81a89d5755d23eb8a483b4':
Set the Security Patch level for MNC
2015-08-26 04:07:19 +00:00
Bart Sears
8a1fa15844
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:49:10 +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
473b6a5f2b
am fc028e59
: Dist the otatools package.
...
* commit 'fc028e59c2bc36297f23cdf2ee4fe9b1b60aa1cd':
Dist the otatools package.
2015-08-25 18:21:13 +00:00
Ying Wang
fc028e59c2
Dist the otatools package.
...
Bug: 23495952
(cherry picked from commit 267e957373
)
Change-Id: I49fcb9fed599268a9d37de7b14280eeb65c34788
2015-08-25 11:13:56 -07:00
Ying Wang
419514bab2
am cf129c53
: am a7eaf450
: Merge "Dist the otatools package."
...
* commit 'cf129c538266cdc5d185a945218e7f76aa22ca27':
Dist the otatools package.
2015-08-25 17:27:36 +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