StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
86,485 Commits 1 Branch 0 Tags
c63a2b36d74dadb51a9cdcc71ad470111ebe3f02
Commit Graph

86485 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dirk Dougherty
99dd0f8604 am 31150b29: am f03f574a: am 3d3d7b7e: doc change: template changes for new SDK doc structure. 
Merge commit '31150b290e980254b0a92f753add0749b9c4b1ca' into eclair-mr2-plus-aosp

* commit '31150b290e980254b0a92f753add0749b9c4b1ca':
  doc change: template changes for new SDK doc structure.
 2009-10-22 11:41:38 -07:00
Dirk Dougherty
308228baa9 am 3b5065ff: am 51da2c57: am fce6b45f: doc change: template/asset changes for sdk package. 
Merge commit '3b5065ff869b85750eb191112235d46a48c05a49' into eclair-mr2-plus-aosp

* commit '3b5065ff869b85750eb191112235d46a48c05a49':
  doc change: template/asset changes for sdk package.
 2009-10-22 11:41:34 -07:00
Dirk Dougherty
31150b290e am f03f574a: am 3d3d7b7e: doc change: template changes for new SDK doc structure. 
Merge commit 'f03f574a021e412b2060116c1112b62b4c21c2fe' into eclair-mr2

* commit 'f03f574a021e412b2060116c1112b62b4c21c2fe':
  doc change: template changes for new SDK doc structure.
 2009-10-22 11:31:55 -07:00
Dirk Dougherty
3b5065ff86 am 51da2c57: am fce6b45f: doc change: template/asset changes for sdk package. 
Merge commit '51da2c573d945d17890e519e7e26a89b2d2f7b51' into eclair-mr2

* commit '51da2c573d945d17890e519e7e26a89b2d2f7b51':
  doc change: template/asset changes for sdk package.
 2009-10-22 11:31:51 -07:00
Dirk Dougherty
daeda811ab am f03f574a: am 3d3d7b7e: doc change: template changes for new SDK doc structure. 
Merge commit 'f03f574a021e412b2060116c1112b62b4c21c2fe' into eclair-plus-aosp

* commit 'f03f574a021e412b2060116c1112b62b4c21c2fe':
  doc change: template changes for new SDK doc structure.
 2009-10-22 11:31:15 -07:00
Dirk Dougherty
db02360018 am 51da2c57: am fce6b45f: doc change: template/asset changes for sdk package. 
Merge commit '51da2c573d945d17890e519e7e26a89b2d2f7b51' into eclair-plus-aosp

* commit '51da2c573d945d17890e519e7e26a89b2d2f7b51':
  doc change: template/asset changes for sdk package.
 2009-10-22 11:31:11 -07:00
Dirk Dougherty
f03f574a02 am 3d3d7b7e: doc change: template changes for new SDK doc structure. 
Merge commit '3d3d7b7efd755d13c7e70f01b1ba00ba0742a354' into eclair

* commit '3d3d7b7efd755d13c7e70f01b1ba00ba0742a354':
  doc change: template changes for new SDK doc structure.
 2009-10-22 11:22:00 -07:00
Dirk Dougherty
51da2c573d am fce6b45f: doc change: template/asset changes for sdk package. 
Merge commit 'fce6b45f629e59b79beed1c18486530c00769bbf' into eclair

* commit 'fce6b45f629e59b79beed1c18486530c00769bbf':
  doc change: template/asset changes for sdk package.
 2009-10-22 11:21:51 -07:00
Owen Lin
ecfec9da14 am 053ff0e6: am 355670b9: am 64d5a807: Add OVERRIDE_PACKAGES support for prebuild modules. 
Merge commit '053ff0e674087e6320fbb961f384b9fe6d2c6949'

* commit '053ff0e674087e6320fbb961f384b9fe6d2c6949':
  Add OVERRIDE_PACKAGES support for prebuild modules.
 2009-10-22 09:50:18 -07:00
Brandon Ballinger
bccc5b549b am 21e91f35: am c6c46243: am 36f349ac: Merge change Ied29246e into eclair 
Merge commit '21e91f357a45069eaa55542dc9f46d1293d1c21c'

* commit '21e91f357a45069eaa55542dc9f46d1293d1c21c':
  Add support for LOCAL_OVERRIDES_PACKAGES to prebuilt build rules.
 2009-10-22 09:50:15 -07:00
Owen Lin
053ff0e674 am 355670b9: am 64d5a807: Add OVERRIDE_PACKAGES support for prebuild modules. 
Merge commit '355670b98584210502f96fe0446a854f07026c28' into eclair-mr2-plus-aosp

* commit '355670b98584210502f96fe0446a854f07026c28':
  Add OVERRIDE_PACKAGES support for prebuild modules.
 2009-10-22 09:33:33 -07:00
Brandon Ballinger
21e91f357a am c6c46243: am 36f349ac: Merge change Ied29246e into eclair 
Merge commit 'c6c462434c17dfbbe3128b2a2804f5d2417ebadb' into eclair-mr2-plus-aosp

* commit 'c6c462434c17dfbbe3128b2a2804f5d2417ebadb':
  Add support for LOCAL_OVERRIDES_PACKAGES to prebuilt build rules.
 2009-10-22 09:33:29 -07:00
The Android Open Source Project
e3ff56068d ERD22 2009-10-22 08:30:32 -07:00
The Android Open Source Project
f13a27e6b8 Merge branch 'eclair' into eclair-release 2009-10-22 08:30:20 -07:00
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
Doug Zongker
9f06c3e651 am 7d3d31d5: (-s ours) am b04f8cdc: am decdbd79: (-s ours) Merge change I5e98e6f0 into eclair 
Merge commit '7d3d31d5642bcae97c44bbdacafdced1e8e1c034'

* commit '7d3d31d5642bcae97c44bbdacafdced1e8e1c034':
  use aapt to build jar files instead of the system zip (DO NOT MERGE)
 2009-10-21 22:44:33 -07:00
Doug Zongker
7d3d31d564 am b04f8cdc: am decdbd79: (-s ours) Merge change I5e98e6f0 into eclair 
Merge commit 'b04f8cdccf01132c7c14df1fed1f39c9dbb752c6' into eclair-mr2-plus-aosp

* commit 'b04f8cdccf01132c7c14df1fed1f39c9dbb752c6':
  use aapt to build jar files instead of the system zip (DO NOT MERGE)
 2009-10-21 22:31:04 -07:00
Doug Zongker
b04f8cdccf am decdbd79: (-s ours) Merge change I5e98e6f0 into eclair 
Merge commit 'decdbd7956c34895f73001cfa2018a27c8702ad0' into eclair-mr2

* commit 'decdbd7956c34895f73001cfa2018a27c8702ad0':
  use aapt to build jar files instead of the system zip (DO NOT MERGE)
 2009-10-21 22:22:32 -07:00
Brett Chabot
3fb149d2cb Remove 'cd top' step from envsetup runtest shortcut. 
Instead, execute runtest as an absolute path. Ths is necessary to support
relative path based arguments in runtest. Bug 2133198
 2009-10-21 20:05:26 -07:00
Dirk Dougherty
3d3d7b7efd doc change: template changes for new SDK doc structure. 
Bug:2160782
 2009-10-21 19:52:52 -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
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