StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,413 Commits 1 Branch 0 Tags
9113badc39c4d86301277b51a1393258cfbdfe0c
Commit Graph

85413 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
The Android Open Source Project
3ad5583653 ERD21 2009-10-21 09:02:02 -07:00
The Android Open Source Project
1e5b3f7f6d Merge branch 'eclair' into eclair-release 2009-10-21 09:01:49 -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
Android (Google) Code Review
decdbd7956 Merge change I5e98e6f0 into eclair 
* changes:
  use aapt to build jar files instead of the system zip (DO NOT MERGE)
 2009-10-20 16:28:14 -04:00
Owen Lin
3d2e5dd514 am f4b3a63c: am daf234d3: am 0a7b54de: Add package Gallery into default build. 
Merge commit 'f4b3a63c560ec157554a2f74bb40627846d39459'

* commit 'f4b3a63c560ec157554a2f74bb40627846d39459':
  Add package Gallery into default build.
 2009-10-20 10:19:04 -07:00
Owen Lin
f4b3a63c56 am daf234d3: am 0a7b54de: Add package Gallery into default build. 
Merge commit 'daf234d374840d96282b34393309487a21ab45c4' into eclair-mr2-plus-aosp

* commit 'daf234d374840d96282b34393309487a21ab45c4':
  Add package Gallery into default build.
 2009-10-20 10:08:00 -07:00
Owen Lin
42bf73a42e am 0a7b54de: Add package Gallery into default build. 
Merge commit '0a7b54de3a7b3a13d8bcc1a11286f374ae51dc21' into eclair-plus-aosp

* commit '0a7b54de3a7b3a13d8bcc1a11286f374ae51dc21':
  Add package Gallery into default build.
 2009-10-20 10:02:59 -07:00
Owen Lin
daf234d374 am 0a7b54de: Add package Gallery into default build. 
Merge commit '0a7b54de3a7b3a13d8bcc1a11286f374ae51dc21' into eclair-mr2

* commit '0a7b54de3a7b3a13d8bcc1a11286f374ae51dc21':
  Add package Gallery into default build.
 2009-10-20 09:57:53 -07:00
The Android Open Source Project
ac7570cba4 ERD20 2009-10-20 08:45:41 -07:00
Owen Lin
0a7b54de3a Add package Gallery into default build. 
Change-Id: Ia4447fdb6c4c26a5419ef59cc9d8276838a95854
 2009-10-20 03:13:04 -07:00
Steve Block
c8ab28a56b am 2d20f686: am 9234663c: WebKit clean required by merge with new WebKit version. 
Merge commit '2d20f686638400ab6f954572d9a7e6e5b969beef'

* commit '2d20f686638400ab6f954572d9a7e6e5b969beef':
  WebKit clean required by merge with new WebKit version.
 2009-10-20 02:44:54 -07:00
Steve Block
2d20f68663 am 9234663c: WebKit clean required by merge with new WebKit version. 
Merge commit '9234663c558239cc7f97f5daf287f12a177e7dba' into eclair-mr2-plus-aosp

* commit '9234663c558239cc7f97f5daf287f12a177e7dba':
  WebKit clean required by merge with new WebKit version.
 2009-10-20 02:34:59 -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
Steve Block
9234663c55 WebKit clean required by merge with new WebKit version. 
Change-Id: I59377d6a0420bfb13b25b4ed7240b47e8aae6114
 2009-10-19 18:41:07 +01:00
The Android Open Source Project
a5efb96129 ERD19B 2009-10-19 09:17:08 -07:00
The Android Open Source Project
ce80ae65eb ERD19 2009-10-19 08:59:48 -07:00
Dirk Dougherty
fce6b45f62 doc change: template/asset changes for sdk package. 2009-10-16 17:14:33 -07:00
The Android Open Source Project
06fe5b8958 ERD16 2009-10-16 11:12:50 -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
The Android Open Source Project
7fb5b57fae ERD15 2009-10-15 08:39:33 -07:00
The Android Open Source Project
e9a2e1fd11 ERD14B 2009-10-14 17:15:53 -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
The Android Open Source Project
2bf43f7162 ERD14 2009-10-14 08:46:57 -07:00
Jean-Baptiste Queru
2a11836482 merge from open-source master 2009-10-14 08:18:24 -07:00
The Android Open Source Project
7f9fd5e6f1 ERD13B 2009-10-13 19:27:21 -07:00
Jean-Baptiste Queru
7b2692d3ce Merge from donut 2009-10-13 18:06:23 -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
The Android Open Source Project
6b6fe7905e ERD13 2009-10-13 13:40:29 -07:00
The Android Open Source Project
23a24dead4 Merge branch 'eclair' into eclair-release 2009-10-13 13:40:13 -07:00
Raphael
73186ceea2 am aa569862: Windows SDK: support tools/sdklauncher and tools/layoutopt 
Merge commit 'aa569862dee45bfa72d342e9982cb5205df9bf04' into eclair-plus-aosp

* commit 'aa569862dee45bfa72d342e9982cb5205df9bf04':
  Windows SDK: support tools/sdklauncher and tools/layoutopt
 2009-10-13 12:18:21 -07: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
Brett Chabot
6592fe834d am 01c8ef9f: Merge commit \'1b3886b8\' into manualmerge 
Merge commit '01c8ef9f5112ef6d6cf8801c722a62ceb7956d37'

* commit '01c8ef9f5112ef6d6cf8801c722a62ceb7956d37':
  Add speech tests to CTS makefile.
 2009-10-13 11:59:59 -07:00
Brett Chabot
5ff0d2dd39 am e4e3a85f: Merge commit \'af6ccb69\' into manualmerge 
Merge commit 'e4e3a85fae3f468d901922450a8da1fc89f7d702'

* commit 'e4e3a85fae3f468d901922450a8da1fc89f7d702':
  Add dpi tests to CTS.
 2009-10-13 11:58:22 -07:00
Android (Google) Code Review
dc54d239a2 Merge change I29b5b2d9 
* changes:
  Add new tabs for Compatibility and Get Source to source.android.com framework
 2009-10-13 11:51:30 -04:00
The Android Open Source Project
fcb5a15a46 ERD12B 2009-10-12 19:34:42 -07:00
The Android Open Source Project
9fdf7dcaad ERD12 2009-10-12 17:56:46 -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
Doug Zongker
441dd2b016 am 160028f8: am f2b32f2a: resolved conflicts for merge of cfd7db6d to eclair 
Merge commit '160028f8325e9e1face3fc6f17baef498ee3e53d'

* commit '160028f8325e9e1face3fc6f17baef498ee3e53d':
  move recovery image to the top of the OTA package
 2009-10-12 12:40:19 -07:00
Jeff Hamilton
042ad44dd8 am ce017f01: am 979d5567: Merge change I6b350185 into eclair 
Merge commit 'ce017f01d006d3e953f3a38f9489360ecd5d0695'

* commit 'ce017f01d006d3e953f3a38f9489360ecd5d0695':
  Add a cleanspec rule for the change to bump the API version to 5.
 2009-10-12 12:31:01 -07:00