tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
25479 commits 1 branch 0 tags 119 MiB
Commit graph

25479 commits

This branch
This branch
All branches
Author SHA1 Message Date
Richard Uhler
bf8ad93d0b am 5d463ff9: am 7086e113: am e4c753f4: Merge "Add ahat to runtime_libart product." 
* commit '5d463ff9ceecb3a2dbc565e33fbbff3c4e60198b':
  Add ahat to runtime_libart product.
 2015-09-01 17:04:30 +00:00
Ying Wang
3680faafc6 am d1a17ff9: am 1cde7639: am 8838c72e: Merge "Cleaned the outdated incrementaljavac." 
* commit 'd1a17ff9a9fc9431e8a9ffda981334a92ab83337':
  Cleaned the outdated incrementaljavac.
 2015-09-01 17:04:29 +00:00
Ying Wang
68ec6f60ec resolved conflicts for merge of 3ead0a7b to master 
Change-Id: Id4a0e030a9ac9c5dad041493eafc97f91af8f7c5
 2015-09-01 10:00:23 -07: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
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
smain@google.com
e8a659670e am 022b2bbb: 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 '022b2bbb144a51d9ec39f66cd03d190cd3fc9108':
  Fix bug that caused table of Studio links to result in "stand-alone" tools instructions. bug: 23570662
 2015-09-01 16:09:03 +00:00
Tao Bao
c31d800fa5 am 418632f5: resolved conflicts for merge of 50827e0d to mnc-dr-dev-plus-aosp 
* commit '418632f517abf509b2cea87a5f5c274222933506':
  Split large files for BBOTA v3.
  Revise stash for BBOTAs when needed.
  Assert the stash size when generating OTAs.
 2015-09-01 16:08:48 +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
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
140bd3f0f6 am f06a2d3b: am f04f391b: am 4548e7f4: Merge "Remove AndroidConfig.h." 
* commit 'f06a2d3b63c56a35db89a273a80329c56713a7e3':
  Remove AndroidConfig.h.
 2015-08-28 20:22:42 +00: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
7ea543b614 am 8c85549a: am c9ff5102: am 35da9685: Merge "Use the basename of file_contexts from the info dict." 
* commit '8c85549a3c8bf80eda3c3f5a738b18632e59f048':
  Use the basename of file_contexts from the info dict.
 2015-08-28 19:03:02 +00:00
Dan Willemsen
85a918b8bb am c222a10d: am d1746299: am 57ff23b0: Merge "Add support for LOCAL_SRC_FILES_(host)_(arch)" 
* commit 'c222a10d0682161ee852c3e0ed9f75b7bedba0ca':
  Add support for LOCAL_SRC_FILES_(host)_(arch)
 2015-08-28 19:03:01 +00:00
Dan Willemsen
bebe2a340f am 00cf9d50: am 399c59f3: am d5deac8d: Merge "Add _(darwin|linux|windows)" 
* commit '00cf9d5008b2f54a4d82a997016cb827643c1193':
  Add _(darwin|linux|windows)
 2015-08-28 19:03:00 +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
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
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
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
Bill Yi
16e017c3c5 am ab0f24d9: am a04a15b2: Merge commit \'18d9bd19a4fd75fc7951b43ba01167838f8bb2ac\' into HEAD 
* commit 'ab0f24d9b51563fef9e9570b0c698c4fb48352b4':
 2015-08-27 23:47:03 +00:00
Tao Bao
a975644122 am 5bf55876: am 4988f18b: am 6458fd96: Merge "rangelib.py: Fix the bug in monotonic check." 
* commit '5bf558767d1191470319237940100d8148040ab8':
  rangelib.py: Fix the bug in monotonic check.
 2015-08-27 23:47:01 +00:00
Bill Yi
ab0f24d9b5 am a04a15b2: Merge commit \'18d9bd19a4fd75fc7951b43ba01167838f8bb2ac\' into HEAD 
* commit 'a04a15b262b81d4ca0835136f1d0f86401e705b5':
 2015-08-27 23:37:42 +00:00
Tao Bao
5bf558767d am 4988f18b: am 6458fd96: Merge "rangelib.py: Fix the bug in monotonic check." 
* commit '4988f18b1f0884eb1365820cb365fc6a6d082d1d':
  rangelib.py: Fix the bug in monotonic check.
 2015-08-27 23:37:41 +00:00