StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,043 Commits 1 Branch 0 Tags
a0ef52302e8e901b81d270b288eb0522c6ffcf2a
Commit Graph

22765 Commits

Author SHA1 Message Date
Owen Lin
355670b985 am 64d5a807: Add OVERRIDE_PACKAGES support for prebuild modules. 
Merge commit '64d5a8070630e816e62fc2d3fdcbe820f50ec924' into eclair-mr2

* commit '64d5a8070630e816e62fc2d3fdcbe820f50ec924':
  Add OVERRIDE_PACKAGES support for prebuild modules.
 2009-10-22 06:44:28 -07:00
Brandon Ballinger
c6c462434c am 36f349ac: Merge change Ied29246e into eclair 
Merge commit '36f349acc9c976cf3966ebde5df6410a09a3d7a5' into eclair-mr2

* commit '36f349acc9c976cf3966ebde5df6410a09a3d7a5':
  Add support for LOCAL_OVERRIDES_PACKAGES to prebuilt build rules.
 2009-10-22 06:43:04 -07:00
Dan Bornstein
3d02eacbde It's not safe to use the TARGET ar when building a HOST .a (natch). 
Change-Id: If9e851fe3306993fb49210952d81ab36cb78c807
 2009-10-21 11:12:56 -07:00
Owen Lin
90a540b321 am 64d5a807: Add OVERRIDE_PACKAGES support for prebuild modules. 
Merge commit '64d5a8070630e816e62fc2d3fdcbe820f50ec924' into eclair-plus-aosp

* commit '64d5a8070630e816e62fc2d3fdcbe820f50ec924':
  Add OVERRIDE_PACKAGES support for prebuild modules.
 2009-10-21 09:52:33 -07:00
Owen Lin
64d5a80706 Add OVERRIDE_PACKAGES support for prebuild modules. 
So that some prebuild module can override existing packages.

Change-Id: I4f0d019e07b84d24cf0234903bd4b06104e0ed27
 2009-10-20 22:23:37 -07:00
Brandon Ballinger
603b894c92 am 36f349ac: Merge change Ied29246e into eclair 
Merge commit '36f349acc9c976cf3966ebde5df6410a09a3d7a5' into eclair-plus-aosp

* commit '36f349acc9c976cf3966ebde5df6410a09a3d7a5':
  Add support for LOCAL_OVERRIDES_PACKAGES to prebuilt build rules.
 2009-10-20 19:43:46 -07:00
Android (Google) Code Review
36f349acc9 Merge change Ied29246e into eclair 
* changes:
  Add support for LOCAL_OVERRIDES_PACKAGES to prebuilt build rules.
 2009-10-20 22:28:45 -04:00
Brandon Ballinger
ed29246e31 Add support for LOCAL_OVERRIDES_PACKAGES to prebuilt build rules. 2009-10-20 17:41:16 -07:00
Doug Zongker
5752ee5a99 am decdbd79: Merge change I5e98e6f0 into eclair 
Merge commit 'decdbd7956c34895f73001cfa2018a27c8702ad0' into eclair-plus-aosp

* commit 'decdbd7956c34895f73001cfa2018a27c8702ad0':
  use aapt to build jar files instead of the system zip (DO NOT MERGE)
 2009-10-20 13:41:04 -07:00
Doug Zongker
5e98e6f05c use aapt to build jar files instead of the system zip (DO NOT MERGE) 
By using 'aapt add' instead of whatever 'zip' utility happens to be
installed on the machine, we get files that are imgdiff-friendly,
which makes for smaller incremental OTAs.

(This is a cherry-pick of a change already submitted to eclair-mr2;
the change was approved for mr1.)
 2009-10-19 17:05:46 -07:00
Dan Bornstein
6bffc91c5d Make the host static library build rule know about 
LOCAL_WHOLE_STATIC_LIBRARIES.

While I was in the territory, I reordered a few lines to be more
consistent with nearby code/files.

Change-Id: Ie9809f065e32ca748ae4539dd785980ff496c2d2
 2009-10-15 16:28:56 -07:00
Jean-Baptiste Queru
3ca0693894 am e93ece70: merge from open-source master 
Merge commit 'e93ece70a8d9657d5d08c59db75582d0d057d3bb'

* commit 'e93ece70a8d9657d5d08c59db75582d0d057d3bb':
  Remove temporary vold logic
  added linux-sh.mk to support SuperH architecture
 2009-10-14 16:16:46 -07:00
Jean-Baptiste Queru
e93ece70a8 merge from open-source master 2009-10-14 16:02:08 -07:00
Jean-Baptiste Queru
2a11836482 merge from open-source master 2009-10-14 08:18:24 -07:00
Doug Zongker
690804c399 am 6ebf4436: Merge change I04432db5 into eclair-mr2 
Merge commit '6ebf443631025b132f644bd349258192db4e3e9c'

* commit '6ebf443631025b132f644bd349258192db4e3e9c':
  use aapt to build jar files instead of the system zip
 2009-10-13 17:10:34 -07:00
Raphael
b54523bc00 am feec1ce3: am aa569862: Windows SDK: support tools/sdklauncher and tools/layoutopt 
Merge commit 'feec1ce3e01c93f43f425747df8073e9580d775a'

* commit 'feec1ce3e01c93f43f425747df8073e9580d775a':
  Windows SDK: support tools/sdklauncher and tools/layoutopt
 2009-10-13 17:09:19 -07:00
Dan Bornstein
fa477ba15e Allow WITH_JIT to be overridden in a custom buildspec.mk file. 
Change-Id: I0fb7ffcfb9786f611e981d8f22f67a5ac8c9c405
 2009-10-13 15:56:48 -07:00
Android (Google) Code Review
6ebf443631 Merge change I04432db5 into eclair-mr2 
* changes:
  use aapt to build jar files instead of the system zip
 2009-10-13 17:12:59 -04:00
Raphael
feec1ce3e0 am aa569862: Windows SDK: support tools/sdklauncher and tools/layoutopt 
Merge commit 'aa569862dee45bfa72d342e9982cb5205df9bf04' into eclair-mr2

* commit 'aa569862dee45bfa72d342e9982cb5205df9bf04':
  Windows SDK: support tools/sdklauncher and tools/layoutopt
 2009-10-13 12:17:40 -07:00
Dianne Hackborn
3d967b873a am 3f7405e9: am ff6f3fe4: Finish issue #2168428: STOP SHIP: Bump API version to 5. 
Merge commit '3f7405e9940db18fade6fb86899bb8b88bd67bcf'

* commit '3f7405e9940db18fade6fb86899bb8b88bd67bcf':
  Finish issue #2168428: STOP SHIP: Bump API version to 5.
 2009-10-13 12:12:03 -07:00
Raphael
aa569862de Windows SDK: support tools/sdklauncher and tools/layoutopt 
Change-Id: Iac7d7a0cdc439b2bb1e334e82fe0f354b14d7001
 2009-10-12 16:16:02 -07:00
Sriram Raman
ca02204ddb am 2bd9027d: Merge change I5bbd2294 into eclair-mr2 
Merge commit '2bd9027d0a2055e56a8047c11dda7f6551b9f183'

* commit '2bd9027d0a2055e56a8047c11dda7f6551b9f183':
  For Ying Wang:
 2009-10-12 12:42:05 -07:00
Joe Onorato
a5ed6af74d am cb9102e0: am 0889661c: eng builds only -- make the thing that makes setupwizard optional actually work. 
Merge commit 'cb9102e056e8553745c2abd942852232bfadd98b'

* commit 'cb9102e056e8553745c2abd942852232bfadd98b':
  eng builds only -- make the thing that makes setupwizard optional actually work.
 2009-10-12 12:30:57 -07:00
Dianne Hackborn
c2289d10cc am de7e9e6e: am 0187d842: Part of issue #2168428: STOP SHIP: Bump API version to 5 
Merge commit 'de7e9e6e8fc4044dbc48f1687af92e7aae1d6638'

* commit 'de7e9e6e8fc4044dbc48f1687af92e7aae1d6638':
  Part of issue #2168428: STOP SHIP: Bump API version to 5
 2009-10-12 12:26:59 -07:00
Brett Chabot
392bda6e09 am 66e0c458: Merge change I7bc67c51 into eclair-mr2 
Merge commit '66e0c458ae94b8520d8d54c15ecf6a283380b69d'

* commit '66e0c458ae94b8520d8d54c15ecf6a283380b69d':
  Manual merge of donut-gms cts.mk changes.
 2009-10-12 11:41:46 -07:00
Doug Zongker
9e4374be2c use aapt to build jar files instead of the system zip 
By using 'aapt add' instead of whatever 'zip' utility happens to be
installed on the machine, we get files that are imgdiff-friendly,
which makes for smaller incremental OTAs.
 2009-10-09 12:14:03 -07:00
Dianne Hackborn
3f7405e994 am ff6f3fe4: Finish issue #2168428: STOP SHIP: Bump API version to 5. 
Merge commit 'ff6f3fe4482bcad900bce2e78204ad5cb466bbf9' into eclair-mr2

* commit 'ff6f3fe4482bcad900bce2e78204ad5cb466bbf9':
  Finish issue #2168428: STOP SHIP: Bump API version to 5.
 2009-10-08 21:07:12 -07:00
Dianne Hackborn
ff6f3fe448 Finish issue #2168428: STOP SHIP: Bump API version to 5. 
We are now 2.0.  Note that CorpCal and PhoneConfig are now gone
until their prebuilts are updated.

Change-Id: I26d13d6b75f5633113d82b8d90788d8bbc915014
 2009-10-08 20:50:27 -07:00
Brett Chabot
1b3886b848 am 45dc54f6: Add speech tests to CTS makefile. 
Merge commit '45dc54f680faea12519870db356f84924c00687d' into eclair

* commit '45dc54f680faea12519870db356f84924c00687d':
  Add speech tests to CTS makefile.
 2009-10-08 10:48:24 -07:00
Brett Chabot
af6ccb69fe am 30e1f2bd: Add dpi tests to CTS. 
Merge commit '30e1f2bdd83ad7b0f2cb8ec738e93ea2a5a6c408' into eclair

* commit '30e1f2bdd83ad7b0f2cb8ec738e93ea2a5a6c408':
  Add dpi tests to CTS.
 2009-10-08 10:48:20 -07:00
Brett Chabot
45dc54f680 Add speech tests to CTS makefile. 2009-10-08 10:00:37 -07:00
Brett Chabot
30e1f2bdd8 Add dpi tests to CTS. 2009-10-08 10:00:37 -07:00
Sriram Raman
5bbd2294e9 For Ying Wang: 
Fix "argument list too long" build error bug.
 2009-10-07 16:27:38 -07:00
Joe Onorato
cb9102e056 am 0889661c: eng builds only -- make the thing that makes setupwizard optional actually work. 
Merge commit '0889661cd890e49a4827da0dc5d583274347d178' into eclair-mr2

* commit '0889661cd890e49a4827da0dc5d583274347d178':
  eng builds only -- make the thing that makes setupwizard optional actually work.
 2009-10-07 11:37:52 -07:00
Joe Onorato
0889661cd8 eng builds only -- make the thing that makes setupwizard optional actually work. 2009-10-07 10:01:13 -07:00
Dianne Hackborn
de7e9e6e8f am 0187d842: Part of issue #2168428: STOP SHIP: Bump API version to 5 
Merge commit '0187d84264fb6cf67650354c8c5da0a0712dbb0b' into eclair-mr2

* commit '0187d84264fb6cf67650354c8c5da0a0712dbb0b':
  Part of issue #2168428: STOP SHIP: Bump API version to 5
 2009-10-06 19:22:41 -07:00
Dianne Hackborn
0187d84264 Part of issue #2168428: STOP SHIP: Bump API version to 5 
This bumps the API version.  We are still going to be an Eclair
development version until prebuilts are updated.

Change-Id: Ie76f3cda15b6c2c0b924db614e8024c04ce5a035
 2009-10-06 17:22:49 -07:00
Jean-Baptiste Queru
03b09fd33f Remove temporary vold logic 2009-10-02 15:06:40 -07:00
Brett Chabot
7bc67c5114 Manual merge of donut-gms cts.mk changes. 2009-10-02 11:09:41 -07:00
android-build SharedAccount
16d088ec1e set BUILD_ID, do not merge 2009-10-02 08:01:02 -07:00
Doug Zongker
5eec9dd20f am da2d06bb: am c18736b1: remember device-specific releasetools extensions in target-files 
Merge commit 'da2d06bb1cf18762257b4f38f698f6d27d6c4412'

* commit 'da2d06bb1cf18762257b4f38f698f6d27d6c4412':
  remember device-specific releasetools extensions in target-files
 2009-10-01 12:10:52 -07:00
Doug Zongker
c18736b1a7 remember device-specific releasetools extensions in target-files 
Store the location of the releasetools extensions in the target-files
zip, and make ota_from_target_files use that stored location by
default (though it can still be overridden with -s if desired).
 2009-09-30 09:20:32 -07:00
Joe Onorato
dea0b8c5ea am 4ff55ba0: am e62902c9: Fix http://b/2114936 - Setting LOCAL_SDK_VERSION current still allows internal API references 
Merge commit '4ff55ba0c7749abb0039fa49024be5f1b0e62de2'

* commit '4ff55ba0c7749abb0039fa49024be5f1b0e62de2':
  Fix http://b/2114936 - Setting LOCAL_SDK_VERSION current still allows internal API references
 2009-09-25 11:04:55 -07:00
Dave Bort
0a71aacfff am 9db1fc2b: am b392641d: Make fail if it\'s called after including 
Merge commit '9db1fc2bea0b75b59ad52f94faa1e7d66209d2d2'

* commit '9db1fc2bea0b75b59ad52f94faa1e7d66209d2d2':
  Make $(my-dir) fail if it's called after including $(CLEAR_VARS)
 2009-09-25 10:51:31 -07:00
Android (Google) Code Review
8392b83176 Merge change 25632 into eclair 
* changes:
  Set default build ID to eclair (usually this is overridden).  Please do not merge.
 2009-09-24 20:20:48 -04:00
Joe Onorato
e62902c95b Fix http://b/2114936 - Setting LOCAL_SDK_VERSION current still allows internal API references 2009-09-24 09:27:35 -07:00
Dave Bort
b392641d9b Make $(my-dir) fail if it's called after including $(CLEAR_VARS) 2009-09-23 12:58:20 -07:00
Jing Yu
2dcc806af5 Add FDO options to Android make system. 2009-09-21 16:31:50 -07:00
Ed Heyl
928aec7cb3 Set default build ID to eclair (usually this is overridden). Please do not merge. 2009-09-17 16:28:37 -07:00
Android Code Review
9a6b73c0aa Merge change 10642 
* changes:
  added linux-sh.mk to support SuperH architecture
 2009-09-17 14:52:55 -07:00