StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,911 Commits 1 Branch 0 Tags
973decf35c2592d6ab9ab5ad9e94e36cd61e0c16
Commit Graph

8452 Commits

Author SHA1 Message Date
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
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
Doug Zongker
2bcfbe7e88 am 32bf3f32: add otatools-package target 
* commit '32bf3f32651ddff9ffa2168017d71ec4b151a0a9':
  add otatools-package target
 2015-08-25 01:20:34 +00:00
Ying Wang
267e957373 Dist the otatools package. 
Bug: 23495952
Change-Id: I1f61946580dd8ea29c3d5e1f4e859cc6d1f8554a
 2015-08-24 17:13:53 -07:00
Tom Cherry
7958b8b6b6 am 2899727f: am bcbd4eb9: Merge "remove TARGET_PROVIDES_INIT_RC" 
* commit '2899727fd7c97729df11c59a4ebf76df73379a28':
  remove TARGET_PROVIDES_INIT_RC
 2015-08-24 23:35:25 +00: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
Doug Zongker
32bf3f3265 add otatools-package target 
Add a target to zip up all the otatools and releasetools, for easy
copying to the OTA builder machine.

Change-Id: I55a6d93c1de75ac936d941c0e3ae72897407f563
(cherry picked from commit f22b0f43ef)
 2015-08-24 15:43:40 -07:00
Tom Cherry
2df35aea43 remove TARGET_PROVIDES_INIT_RC 
Change-Id: I765b80d48333f54fb995e4ccfd77d38683c6cbb9
 2015-08-24 13:55:02 -07:00
Christopher Wiley
597a65cad0 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:25:31 +00: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
132f6dea3e 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:07 +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
7ffa77e8e7 am 344c3394: am 6f534125: Merge "Fix Linux host checkbuilds." 
* commit '344c33949b48ec5f3d27bff36f145f157156cf19':
  Fix Linux host checkbuilds.
 2015-08-21 00:12:19 +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