Commit Graph

24441 Commits

Author SHA1 Message Date
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
Tao Bao
2f44006a4b am 8f4b307e: Merge "releasetools: Fix the bug when deleting files."
* commit '8f4b307e56ea73153f249b44dc2b15de77e058f7':
  releasetools: Fix the bug when deleting files.
2015-09-04 17:56:22 +00:00
Ying Wang
af72e1b3e6 Merge "Move part of logtags stuff back to base_rules.mk." 2015-09-04 17:31:07 +00:00
Tao Bao
8f4b307e56 Merge "releasetools: Fix the bug when deleting files." 2015-09-04 17:05:55 +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
Tao Bao
a77d41e2f7 releasetools: Fix the bug when deleting files.
For file-based OTAs, we used to remove unneeded files in ascending
order, which failed to delete non-empty directories. Reverse the order
to fix the issue.

For example, now we have the following in our generated script:
  delete("/system/app/Calculator/arm/Calculator.odex",
         "/system/app/Calculator/arm/",
         "/system/app/Calculator/Calculator.apk",
         "/system/app/Calculator/");

Bug: 22960996
Change-Id: I0d36d29b7862fb53bf55bf5685a990180f9c0b3b
2015-09-03 21:21:55 -07: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
4379e2b8bb Merge "Add LOCAL_MODULE_HOST_OS" 2015-09-04 01:24:15 +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
Tom Cherry
b8b535349a am 62062c9d: Merge "move init.trace.rc to frameworks/native"
* commit '62062c9d66e38ad404d93e963c1341fa4b7090fe':
  move init.trace.rc to frameworks/native
2015-09-03 22:02:38 +00:00
Tom Cherry
62062c9d66 Merge "move init.trace.rc to frameworks/native" 2015-09-03 21:52:45 +00:00
Tom Cherry
05bd7f3499 move init.trace.rc to frameworks/native
init.trace.rc will be renamed to atrace.rc and use the LOCAL_INIT_RC
mechanism to be included on /system appropriately.

Bug 23186545

Change-Id: Ibb86761d3e8d3c6d194ddb1220f93a71a8c6675b
2015-09-03 14:20:43 -07:00
Tao Bao
3fb3ece67e am c6c9c61d: Merge "releasetools: Fix the bug in symlink deletion."
* commit 'c6c9c61d05ffcc41239baaa1f3011b17e8518b65':
  releasetools: Fix the bug in symlink deletion.
2015-09-03 01:40:41 +00:00
Tao Bao
c6c9c61d05 Merge "releasetools: Fix the bug in symlink deletion." 2015-09-03 01:32:08 +00:00
Tao Bao
84006eacd0 releasetools: Fix the bug in symlink deletion.
For file-based OTAs, symlinks in the source build but not in the target
build will be deleted. However, if a symlink is replaced by a regular
file in the target build, the file will be accidentally deleted when
applying (resuming) the same package again.

Verify the checksum of a symlink that will be unpacked or renamed to.
Delete the file only if it doesn't have the target checksum.

Bug: 23646151
Change-Id: Ie322abb6022b6fa812c6b36a3127872d9614fc3b
2015-09-02 17:51:16 -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
Evgenii Stepanov
617770c133 Merge "Add AddressSanitizer linker flags for x86." 2015-09-02 20:13:37 +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
e1b9123d51 Merge "Set --ninja_suffix based on make/mm/mmm targets" 2015-09-01 23:53:41 +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
Richard Uhler
7086e1136a am e4c753f4: Merge "Add ahat to runtime_libart product."
* commit 'e4c753f428ff404f10ec1bf170ea18ed2687dc07':
  Add ahat to runtime_libart product.
2015-09-01 16:36:23 +00:00
Ying Wang
1cde7639ed am 8838c72e: Merge "Cleaned the outdated incrementaljavac."
* commit '8838c72e8a339270fb3bea3d467200c6c0c28782':
  Cleaned the outdated incrementaljavac.
2015-09-01 16:35:59 +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
Richard Uhler
e4c753f428 Merge "Add ahat to runtime_libart product." 2015-08-31 16:53:55 +00:00
Ying Wang
8838c72e8a Merge "Cleaned the outdated incrementaljavac." 2015-08-29 18:09:20 +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
Ying Wang
a15ae2160a Merge "Move Java stuff out of base_rules.mk" 2015-08-29 16:40:30 +00: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
Richard Uhler
7324f30a4f Add ahat to runtime_libart product.
Change-Id: Iae5837f884c926a9f0e57df56bd21b6260ee8b2d
2015-08-28 16:30:17 -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
4548e7f49d Merge "Remove AndroidConfig.h." 2015-08-28 19:47:36 +00:00
Tao Bao
c9ff5102ad am 35da9685: Merge "Use the basename of file_contexts from the info dict."
* commit '35da9685f0d3bb367b50aaa4c476b12907099f77':
  Use the basename of file_contexts from the info dict.
2015-08-28 18:46:31 +00:00
Tao Bao
35da9685f0 Merge "Use the basename of file_contexts from the info dict." 2015-08-28 18:33:25 +00:00
Tao Bao
79735a6a82 Use the basename of file_contexts from the info dict.
Changes in [1] break the backward compatibility of the OTA scripts. Fix
the issue by extracting the file basename from the info dict in
META/misc_info.txt.

[1] commit d3a803e668

Bug: 23620049
Change-Id: I40a5625bbe0beb295f34b2328906a4a4283fe59b
2015-08-28 11:17:38 -07: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
57ff23b0ed Merge "Add support for LOCAL_SRC_FILES_(host)_(arch)" 2015-08-28 03:39:34 +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
d5deac8db9 Merge "Add _(darwin|linux|windows)" 2015-08-28 03:37:30 +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