StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,738 Commits 1 Branch 0 Tags
91a5e6512325234fcd6c955a94e9560159bca579
Commit Graph

5738 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Queru
91a5e65123 Remove photo and video editors from full builds 
Change-Id: I5541fee3cd28a550945414510bc1e8141bc818fd
 2011-06-10 14:22:27 -07:00
Mike Lockwood
aef9309b4e Merge "Add support for products overriding properties in /default.prop" 2011-06-09 15:46:00 -07:00
Jean-Baptiste Queru
c96db7f454 Reconcile with gingerbread-release honeycomb-mr2-release honeycomb-LTE-release 
Change-Id: I3da699139b9c67b09c8076f3fdef0c7c115ffbcc
 2011-06-09 15:00:56 -07:00
Mike Lockwood
0d23fec792 Add support for products overriding properties in /default.prop 
We need this to allow products to specify the default USB configuration,
and allow the build system to add adb to this configuration
for eng and userdebug builds.

For example:

PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
	persist.sys.usb.config=mtp

Change-Id: I83d7d918e57a8117eb96919e17d8ad52afdc0388
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-06-09 14:54:40 -07:00
android-merger
28966abd44 GRJ70B 
Change-Id: I4142cfae1378d46c6ee9ae795bcf21af91039505
 2011-06-09 13:55:16 -07:00
The Android Automerger
675b73417d GRJ70 
Change-Id: If43e3bcca9e61825d1a7f3287b233d1e9f5e32ad
 2011-06-09 13:45:46 -07:00
The Android Automerger
565d3c5b4c merge in gingerbread-release history after reset to gingerbread 2011-06-09 13:45:18 -07:00
The Android Automerger
461e080ad7 HTJ70 
Change-Id: I77af93ce68f43904414ecd92f39882f88f8f9c57
 2011-06-09 07:11:24 -07:00
The Android Automerger
e4affc87b2 merge in honeycomb-mr2-release history after reset to honeycomb-mr2 2011-06-09 07:11:19 -07:00
The Android Automerger
92adf7b7f3 HLJ70 
Change-Id: I1894d3be0640212779cbeb7e57fea7c63d4af66b
 2011-06-09 06:08:38 -07:00
The Android Automerger
e4bbfa1013 merge in honeycomb-LTE-release history after reset to honeycomb-LTE 2011-06-09 06:08:28 -07:00
Mike Lockwood
8b7e14be60 Merge "post_process_props: Write mangled properties back to file instead of stdout" 2011-06-08 19:11:02 -07:00
Mike Lockwood
5b65ee4974 post_process_props: Write mangled properties back to file instead of stdout 
Change-Id: I78b642400c46019165f12d409a238344ca6e09dd
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-06-08 19:06:43 -07:00
Chia-chi Yeh
2bcdd1e2ff Merge "Add VpnDialogs for user space VPN." 2011-06-08 18:57:37 -07:00
The Android Automerger
5c694c67d4 HLJ69B 
Change-Id: I8f1c4a23fe95bf8ff505f302a96a05f265dee938
 2011-06-08 18:02:10 -07:00
The Android Automerger
96abfb00fc merge in honeycomb-LTE-release history after reset to honeycomb-LTE 2011-06-08 18:02:02 -07:00
Joe Onorato
569e4fab49 Merge "post process the system properties" 2011-06-08 16:04:45 -07:00
Joe Onorato
9197a487b4 post process the system properties 
Change-Id: Ib78fe238d90dd4523326e4fa088d9333edc9e299
 2011-06-08 16:04:14 -07:00
Ed Heyl
23687596a1 am d23d0f07: (-s ours) am ec664803: am c811f291: add ANDROID_HOST_OUT to env (please do not merge) 
* commit 'd23d0f076465a2aaf86989de01cdcc686842499a':
  add ANDROID_HOST_OUT to env (please do not merge)
 2011-06-08 11:02:27 -07:00
Eino-Ville Talvala
6f45ba1daa Merge "Ensure all filter framework libraries are included." 2011-06-08 10:27:25 -07:00
Jean-Baptiste Queru
6442c8585a Reconcile with gingerbread-release 
Change-Id: Iade0c3ecab1c6d6a0b8c3ab7381c60975393d9a1
 2011-06-08 08:09:02 -07:00
The Android Automerger
c6594921c5 HTJ69 
Change-Id: Ica8c8a4e09e1452ea10a6b00b817e1117013a30f
 2011-06-08 07:10:18 -07:00
The Android Automerger
5d6faa4bb3 merge in honeycomb-mr2-release history after reset to honeycomb-mr2 2011-06-08 07:10:14 -07:00
The Android Automerger
cc0f0a04ac HLJ69 
Change-Id: I199c5f33514d99bbdbd70eddbfa767f99f850249
 2011-06-08 06:12:43 -07:00
The Android Automerger
169c83e1ff merge in honeycomb-LTE-release history after reset to honeycomb-LTE 2011-06-08 06:12:31 -07:00
Jean-Baptiste Queru
1cc1b10f0b am f0d2a546: Merge 78e7f1f0 
* commit 'f0d2a54669c8bf14e95482437e361c81dfb62404':
  Increase the Java heap size for droiddoc
 2011-06-07 18:20:30 -07:00
Jean-Baptiste Queru
513e0ee851 am 0a6c12be: Merge 5adc2d05 
* commit '0a6c12be9b17ce74ac0af017b353b72b25550cf0':
 2011-06-07 18:20:28 -07:00
Jean-Baptiste Queru
70776231ee am 45a3ad7d: Merge c1efb060 
* commit '45a3ad7d225495367a47440da118609b4940fe71':
  Relax the constraint of 64bit build environment.
 2011-06-07 18:20:25 -07:00
Ying Wang
2695977b7f am 60d6ef91: am 1482d2db: am e2419c89: Support to run dex-preopt on prebuilt apks. 
* commit '60d6ef91b6e1f7803fdf7869afba01cdf37f1b17':
  Support to run dex-preopt on prebuilt apks.
 2011-06-07 17:16:24 -07:00
The Android Automerger
c47523c8f8 HTJ68B 
Change-Id: I858c6b5c74be695de5d374eba0000161430b2fd0
 2011-06-07 15:30:11 -07:00
The Android Automerger
4835d110ae merge in honeycomb-mr2-release history after reset to honeycomb-mr2 2011-06-07 15:30:05 -07:00
Doug Kwan
b26e497374 Add libgabi++. We need this for RTTI. 
Change-Id: I0cae803b16babf84e7be2e80681d33469ce43964
 2011-06-07 15:09:19 -07:00
Eino-Ville Talvala
a3ab691118 Ensure all filter framework libraries are included. 
Change-Id: I48f75868b4082d2b47c451ffc7251dfa5b25e8c1
 2011-06-07 15:04:38 -07:00
Ed Heyl
d23d0f0764 am ec664803: am c811f291: add ANDROID_HOST_OUT to env (please do not merge) 
* commit 'ec6648036ef9e0d4fe25a4d4abbd79279d2ee9d0':
  add ANDROID_HOST_OUT to env (please do not merge)
 2011-06-07 13:15:20 -07:00
Jean-Baptiste Queru
f0d2a54669 Merge 78e7f1f0 
Change-Id: I4d24d154fd3964a4433baf87e4061421fce28986
 2011-06-07 13:11:14 -07:00
Jean-Baptiste Queru
0a6c12be9b Merge 5adc2d05 
Change-Id: I84a96fc4ca9db476e62959425f622fc88527e181
 2011-06-07 13:10:18 -07:00
Jean-Baptiste Queru
45a3ad7d22 Merge c1efb060 
Change-Id: I5688046fd44bc6420b541a0eb97a46d216655a3d
 2011-06-07 13:10:06 -07:00
Ed Heyl
ec6648036e am c811f291: add ANDROID_HOST_OUT to env (please do not merge) 
* commit 'c811f29198fc4862e22dbf233bc28210d14e0205':
  add ANDROID_HOST_OUT to env (please do not merge)
 2011-06-07 12:55:39 -07:00
Ed Heyl
c811f29198 add ANDROID_HOST_OUT to env (please do not merge) 
Change-Id: I97e49fcb2610344df1907ec17116ee6e8a586e38
 2011-06-07 12:35:46 -07:00
Doug Kwan
e3c3c6d4fe Allow per module RTTI setting. This fixes a bug in previous check-ins. 
Change-Id: I5fcac192a7945720fd7667f7497078d310370bc5
 2011-06-07 10:55:48 -07:00
Jean-Baptiste Queru
65ce6faa87 Reconcile with honeycomb-mr2-release honeycomb-LTE-release 
Change-Id: Id467baa2d2c87f9cf16ca4fb66be3a8a9f50008d
 2011-06-07 10:42:18 -07:00
Brian Carlstrom
976672b4e6 Merge "Add KeyChain to core product defintion since Browser depends on it" 2011-06-07 10:30:30 -07:00
Martijn Coenen
3c22287c1b Revert "x86: Enable -fstack-protector" 
This reverts commit e397dcccbb.
 2011-06-07 08:57:34 -07:00
The Android Automerger
2713fa0a2c HTJ68 
Change-Id: I7baad71a7587fa3c47f3d07d763376c24586e343
 2011-06-07 07:10:44 -07:00
The Android Automerger
6ad539be44 merge in honeycomb-mr2-release history after reset to honeycomb-mr2 2011-06-07 07:10:29 -07:00
The Android Automerger
1df1d4420d HLJ68 
Change-Id: I2a9e9b11f0ceb6f49baec44f5ac3deac8ba33a7f
 2011-06-07 06:12:17 -07:00
The Android Automerger
bc79eeb9da merge in honeycomb-LTE-release history after reset to honeycomb-LTE 2011-06-07 06:12:12 -07:00
Brian Carlstrom
869727e575 Add KeyChain to core product defintion since Browser depends on it 
Change-Id: I7c8ca42565875e72c7297c41d8bcb9cf1c1b4664
 2011-06-06 21:35:47 -07:00
Ying Wang
60d6ef91b6 am 1482d2db: am e2419c89: Support to run dex-preopt on prebuilt apks. 
* commit '1482d2db83abaa7d9a01831bdaeb99d4a68fd68a':
  Support to run dex-preopt on prebuilt apks.
 2011-06-06 17:29:49 -07:00
Ying Wang
65b710aefd Merge "Use arg list file to pass arguments to jar." 2011-06-06 16:24:46 -07:00