openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity
24,896 Commits 2 Branches 1 Tag 73 MiB
Commit Graph

24896 Commits

Author SHA1 Message Date
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
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 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
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
Tao Bao fabd21438c am 1599e380: am a125075a: am ccad82c5: Merge "Revert "Temporarily use blockimgdiff v2 for OTA."" into mnc-dr-dev 
* commit '1599e380bce31e11961d09b1be1a956dd692af80':
  Revert "Temporarily use blockimgdiff v2 for OTA."
 2015-09-01 19:28:24 +00:00
Tao Bao 1599e380bc am a125075a: am ccad82c5: Merge "Revert "Temporarily use blockimgdiff v2 for OTA."" into mnc-dr-dev 
* commit 'a125075a5fd0e599d622e288b798cdc3fefe27ac':
  Revert "Temporarily use blockimgdiff v2 for OTA."
 2015-09-01 19:21:02 +00:00
Tao Bao a125075a5f am ccad82c5: Merge "Revert "Temporarily use blockimgdiff v2 for OTA."" into mnc-dr-dev 
* commit 'ccad82c52e7c37c70fce579cf14377a88b885ae4':
  Revert "Temporarily use blockimgdiff v2 for OTA."
 2015-09-01 19:10:11 +00: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
Richard Uhler 5d463ff9ce am 7086e113: am e4c753f4: Merge "Add ahat to runtime_libart product." 
* commit '7086e1136a898caa0316002419eb9961f554459e':
  Add ahat to runtime_libart product.
 2015-09-01 16:43:48 +00:00
Ying Wang d1a17ff9a9 am 1cde7639: am 8838c72e: Merge "Cleaned the outdated incrementaljavac." 
* commit '1cde7639edd14a483cfe1bbd0ee8725e02ce9f2e':
  Cleaned the outdated incrementaljavac.
 2015-09-01 16:43:47 +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
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
smain@google.com 022b2bbb14 am 59bc4701: am deb3c8c4: am 77c1ff7b: am 4ffdc8fa: Fix bug that caused table of Studio links to result in "stand-alone" tools instructions. bug: 23570662 
* commit '59bc470107ad2e1aac75155f3acc07755232534c':
  Fix bug that caused table of Studio links to result in "stand-alone" tools instructions. bug: 23570662
 2015-08-31 22:07:09 +00:00
smain@google.com 59bc470107 am deb3c8c4: am 77c1ff7b: am 4ffdc8fa: Fix bug that caused table of Studio links to result in "stand-alone" tools instructions. bug: 23570662 
* commit 'deb3c8c4533035df6bd4dc7e88b400b1d71e7a42':
  Fix bug that caused table of Studio links to result in "stand-alone" tools instructions. bug: 23570662
 2015-08-31 21:57:17 +00:00
smain@google.com deb3c8c453 am 77c1ff7b: am 4ffdc8fa: Fix bug that caused table of Studio links to result in "stand-alone" tools instructions. bug: 23570662 
* commit '77c1ff7bf983ef4622ecb227d4e5b0c75728c28f':
  Fix bug that caused table of Studio links to result in "stand-alone" tools instructions. bug: 23570662
 2015-08-31 21:46:46 +00:00
Tao Bao 418632f517 resolved conflicts for merge of 50827e0d to mnc-dr-dev-plus-aosp 
Change-Id: I88f94e520f59a381f441de9d4bad158b6c7045c4
 2015-08-31 14:38:31 -07:00
smain@google.com 77c1ff7bf9 am 4ffdc8fa: Fix bug that caused table of Studio links to result in "stand-alone" tools instructions. bug: 23570662 
* commit '4ffdc8faf2c795027f38b6ef4685dd6d1179878e':
  Fix bug that caused table of Studio links to result in "stand-alone" tools instructions. bug: 23570662
 2015-08-31 21:36:29 +00:00
Tao Bao 50827e0d95 am 29c245e8: am e337093e: Merge changes from topic \'stash-size\' into mnc-dr-dev 
* commit '29c245e803496625cb3b72719f1cdce8d73de041':
  Split large files for BBOTA v3.
  Revise stash for BBOTAs when needed.
  Assert the stash size when generating OTAs.
 2015-08-31 21:18:08 +00:00
Tao Bao 29c245e803 am e337093e: Merge changes from topic \'stash-size\' into mnc-dr-dev 
* commit 'e337093e6c5d502f0f4094639b41c001b3048d0f':
  Split large files for BBOTA v3.
  Revise stash for BBOTAs when needed.
  Assert the stash size when generating OTAs.
 2015-08-31 21:10:06 +00:00
Tao Bao e337093e6c Merge changes from topic 'stash-size' into mnc-dr-dev 
* changes:
  Split large files for BBOTA v3.
  Revise stash for BBOTAs when needed.
  Assert the stash size when generating OTAs.
 2015-08-31 20:59:48 +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
smain@google.com 4ffdc8faf2 Fix bug that caused table of Studio links to result in "stand-alone" tools instructions. 
bug: 23570662

Change-Id: I7482eddbeffa581307bf7f76b9653de41966b6f9
 2015-08-28 17:27:47 -07: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 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 4548e7f49d Merge "Remove AndroidConfig.h." 2015-08-28 19:47:36 +00:00
Tao Bao 8c85549a3c am c9ff5102: am 35da9685: Merge "Use the basename of file_contexts from the info dict." 
* commit 'c9ff5102ad9258f9189afd3bd15eb58cab186215':
  Use the basename of file_contexts from the info dict.
 2015-08-28 18:56: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