StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,223 Commits 1 Branch 0 Tags
fe75781ee9b51bc1266f5e9d002637c53cd3c92c
Commit Graph

2223 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
fe75781ee9 am 81b68ad9: Merge "docs: show the download message on the SDK homepage because we no longer need to walk through the TOS" into froyo 
Merge commit '81b68ad95d6a8ecb8a44ad453d336dff3a059488' into froyo-plus-aosp

* commit '81b68ad95d6a8ecb8a44ad453d336dff3a059488':
  docs: show the download message on the SDK homepage because we no longer
 2010-06-24 18:11:52 -07:00
Scott Main
81b68ad95d Merge "docs: show the download message on the SDK homepage because we no longer need to walk through the TOS" into froyo 2010-06-24 18:10:32 -07:00
Ying Wang
665828875b am c048c9b5: default empty tapas to TARGET_BUILD_APPS "all" 
Merge commit 'c048c9b598b36dc7506a954cc0d3d80f308b1b13' into froyo-plus-aosp

* commit 'c048c9b598b36dc7506a954cc0d3d80f308b1b13':
  default empty tapas to TARGET_BUILD_APPS "all"
 2010-06-24 18:00:46 -07:00
Scott Main
a1b358a22c docs: show the download message on the SDK homepage because we no longer 
need to walk through the TOS

Change-Id: I46f7e7284792b2bea77cf2a88b195e8117b4e4d2
 2010-06-24 17:57:50 -07:00
Ying Wang
c048c9b598 default empty tapas to TARGET_BUILD_APPS "all" 
So that "tapas" without argument won't end in makefile-could-not-load error in unbundled branch.
Also, the magic "all" apps will build only apps, not other things.

Change-Id: Iac6dd928ee4e42996147acdab31930cd4ffa1768
 2010-06-24 15:13:09 -07:00
Doug Zongker
bf77b69422 am 3b85269c: include build timestamp in OTA metadata 
Merge commit '3b85269cfe10ec15e9b544dd6964b8c9f5f761f9' into froyo-plus-aosp

* commit '3b85269cfe10ec15e9b544dd6964b8c9f5f761f9':
  include build timestamp in OTA metadata
 2010-06-21 15:42:14 -07:00
Doug Zongker
3b85269cfe include build timestamp in OTA metadata 
Change-Id: I44292c6346db3356dfafbd044027e37a9b467cfe
 2010-06-21 15:31:39 -07:00
Ying Wang
ca553e21f8 am 06898660: A nothing-to-do build should do nothing. 
Merge commit '068986605b2afcd5e044b62f22ac6ecd5c15b519' into froyo-plus-aosp

* commit '068986605b2afcd5e044b62f22ac6ecd5c15b519':
  A nothing-to-do build should do nothing.
 2010-06-21 09:06:12 -07:00
The Android Open Source Project
8b8ee713e0 merge from open-source master 
Change-Id: Ia4356e797e0c9bceec56a9a5cfeab3def5ae453c
 2010-06-18 13:49:35 -07:00
Jean-Baptiste Queru
979e4765e7 Change branch name to openmaster, to avoid confusion 
Change-Id: Ibd0e460fd0f0c5d6fa4c1f858fbc280a0bcf7f1a
 2010-06-18 08:11:13 -07:00
Ying Wang
068986605b A nothing-to-do build should do nothing. 
Before this CL, ota_from_target_files is always executed even with no new change.

Change-Id: I29d6aef3c60e5b0229551a3bf22f2d31cb41f219
 2010-06-17 17:52:18 -07:00
The Android Open Source Project
aa90e9eac8 merge from open-source master 
Change-Id: I55d36474223c79e6ab5000b2cb09b01762eb3823
 2010-06-17 09:58:36 -07:00
Jean-Baptiste Queru
7ef314546b Revert "Build BUILD_MULTI_PREBUILT for the prebuilt target" 
This reverts commit 9bfd697cff,
which was causing all prebuilts to be installed in all builds.

Change-Id: Ia5973b31d23bd74ec187b9e44715dea56c063efe
 2010-06-17 09:30:37 -07:00
Joe Onorato
8aeb7cc461 am 2b8d2383: Merge changes I02214abd,I79e6f60e into froyo 
Merge commit '2b8d2383043a2b16e53538f9ebf123bfffd27ba1' into froyo-plus-aosp

* commit '2b8d2383043a2b16e53538f9ebf123bfffd27ba1':
  Add a tapas command.
  Rename is_unbundled_app_build and UNBUNDLED_APP_BUILD to TARGET_BUILD_APPS.
 2010-06-15 14:24:42 -07:00
Joe Onorato
2b8d238304 Merge changes I02214abd,I79e6f60e into froyo 
* changes:
  Add a tapas command.
  Rename is_unbundled_app_build and UNBUNDLED_APP_BUILD to TARGET_BUILD_APPS.
 2010-06-15 13:59:01 -07:00
The Android Open Source Project
5cbd5d9ff4 merge from open-source master 
Change-Id: I058f809f7e7eb69a757cb75f934a3630dfd7d777
 2010-06-14 09:03:32 -07:00
Jean-Baptiste Queru
633c4a5094 Merge "generic.mk: Replaced AlarmClock with newer DeskClock App" 2010-06-11 15:45:15 -07:00
Ying Wang
290f527297 am a07d37b7: Cherry-pick bug fixes from master. 
Merge commit 'a07d37b79300e76da5f21f532578fcd686a74b16' into froyo-plus-aosp

* commit 'a07d37b79300e76da5f21f532578fcd686a74b16':
  Cherry-pick bug fixes from master.
 2010-06-11 09:05:05 -07:00
Joe Onorato
da12daf15f Add a tapas command. 
(Actually there was a tapas command that just called choosecombo).

The new better tapas command is for building unbundled apps.  Run
it with one or more modules to build and optionally a build variant.

tapas [variant] App1 App2 ...

If you don't supply a build variant, it defaults to eng.

Change-Id: I02214abd0b5ad02e364fcb024e10cf6ad17a9e68
 2010-06-10 18:38:37 -07:00
Joe Onorato
16fa4b290e Rename is_unbundled_app_build and UNBUNDLED_APP_BUILD to TARGET_BUILD_APPS. 
Change-Id: I79e6f60e009dad3a48709962347441e4ca0c337a
 2010-06-10 18:38:25 -07:00
Ying Wang
a07d37b793 Cherry-pick bug fixes from master. 
1. Set correct aidl_preprocess_import for LOCAL_SDK_VERSION current.
2. Set correct PRIVATE_BOOTCLASSPATH for non-empty LOCAL_SDK_VERSION.

Change-Id: Iff8e266931434863521bfa4621767bed31d31cc0
 2010-06-09 12:08:07 -07:00
Ying Wang
ab251d9c80 am 7a794289: Merge "Unbundle the build system." into froyo 
Merge commit '7a7942899eedde3b946768a155fac3d70af5c9c3' into froyo-plus-aosp

* commit '7a7942899eedde3b946768a155fac3d70af5c9c3':
  Unbundle the build system.
 2010-06-09 11:33:36 -07:00
Ying Wang
7a7942899e Merge "Unbundle the build system." into froyo 2010-06-09 11:31:29 -07:00
Ying Wang
0f6f4ca54e Unbundle the build system. 
Change-Id: I88912d876c3972212e8871b3e5b3b8b6d2da34d0
 2010-06-09 10:26:26 -07:00
Jeff Hamilton
d35e7f5aab am 04be0d86: Set JAVA_HOME to point to java 1.5. 
Merge commit '04be0d869acce82293b6c668f52bddf14c106908' into froyo-plus-aosp

* commit '04be0d869acce82293b6c668f52bddf14c106908':
  Set JAVA_HOME to point to java 1.5.
 2010-06-08 14:05:12 -07:00
Jeff Hamilton
04be0d869a Set JAVA_HOME to point to java 1.5. 
Change-Id: I1304b78b17cd13a2231c59385a94e0430a8198ff
 2010-06-08 15:38:47 -05:00
The Android Open Source Project
f56e9165d9 merge from open-source master 
Change-Id: I2169fb30a5bfe48501745b2141e82ad9e25971aa
 2010-06-08 13:14:30 -07:00
Jean-Baptiste Queru
64947314b7 Merge "Build BUILD_MULTI_PREBUILT for the prebuilt target" 2010-06-08 10:06:47 -07:00
The Android Open Source Project
4873d8f5ca merge from open-source master 
Change-Id: Id3161ac44e0eaba0184b3d2d4af43e4e40d26e90
 2010-06-04 07:56:24 -07:00
Jeff Hamilton
8d09b69e2d Build host tools as 32bit on all Darwin machines. 
Change-Id: I121b388056e68b787518c66a01c172bc4ffaef9b
 2010-06-03 17:59:11 -05:00
Ying Wang
e8ffa14900 am ba16a89d: Override LOCAL_CERTIFICATE in inherit-package. 
Merge commit 'ba16a89dbd61003a3b907d0f5e8fc48fba2afcab' into froyo-plus-aosp

* commit 'ba16a89dbd61003a3b907d0f5e8fc48fba2afcab':
  Override LOCAL_CERTIFICATE in inherit-package.
 2010-06-02 14:37:28 -07:00
Ying Wang
ba16a89dbd Override LOCAL_CERTIFICATE in inherit-package. 
it's to fix typo.

Change-Id: I9a791faa4b7b5967b5d23bfcb4caeebaef94e723
 2010-06-02 13:24:36 -07:00
Ying Wang
b93e03cbc9 am 52911309: Cherry-pick unbundled build changes from master 
Merge commit '529113098350c026ec521258d4c6fba51f285a48' into froyo-plus-aosp

* commit '529113098350c026ec521258d4c6fba51f285a48':
  Cherry-pick unbundled build changes from master
 2010-06-02 13:09:12 -07:00
Ying Wang
5291130983 Cherry-pick unbundled build changes from master 
Change-Id: I82cab32f00b7b729d9b01c8e1532c8bf0ad2fb92
 2010-05-26 13:39:31 -07:00
Xavier Ducrohet
0c5363c857 am 8e5605a7: Add QuickSearchBox to the SDK build. 
Merge commit '8e5605a774fd2f61c6d5bae0440b20fc0bdd79f7' into froyo-plus-aosp

* commit '8e5605a774fd2f61c6d5bae0440b20fc0bdd79f7':
  Add QuickSearchBox to the SDK build.
 2010-05-25 17:49:24 -07:00
Xavier Ducrohet
8e5605a774 Add QuickSearchBox to the SDK build. 
Change-Id: Ia0cc7b4cd8245d368685d50cf32cd21875cbdbbf
 2010-05-25 17:03:42 -07:00
Scott Main
b7ebe01f60 am ca671ab7: Revert "Doc change: Update froyo mark for home" 
Merge commit 'ca671ab7a661625e021f2145e2d01f39d542fb28' into froyo-plus-aosp

* commit 'ca671ab7a661625e021f2145e2d01f39d542fb28':
  Revert "Doc change: Update froyo mark for home"
 2010-05-25 12:31:29 -07:00
Scott Main
ca671ab7a6 Revert "Doc change: Update froyo mark for home" 
This reverts commit 9d1d6441d9.
 2010-05-25 12:22:29 -07:00
Christian Mehlmauer
8056ee21f0 generic.mk: Replaced AlarmClock with newer DeskClock App 
Change-Id: I2afe4876b1dd7e9e9200e27ba64eebe4a34065fb
 2010-05-22 22:22:26 +02:00
Dirk Dougherty
d44754e0e5 am e9b01eb4: Doc change: add tv assets for carousel. 
Merge commit 'e9b01eb46d461e7cfecb365acf046e2ad56c05a0' into froyo-plus-aosp

* commit 'e9b01eb46d461e7cfecb365acf046e2ad56c05a0':
  Doc change: add tv assets for carousel.
 2010-05-20 00:15:38 -07:00
Dirk Dougherty
e9b01eb46d Doc change: add tv assets for carousel. 
Change-Id: I357509c83e64ceb898b2069482ff1d0f3b3337cc
 2010-05-19 19:42:12 -07:00
Dirk Dougherty
e5cfdbfb17 am 9d1d6441: Doc change: Update froyo mark for home 
Merge commit '9d1d6441d97eeea80c70c549646d7c177936e148' into froyo-plus-aosp

* commit '9d1d6441d97eeea80c70c549646d7c177936e148':
  Doc change: Update froyo mark for home
 2010-05-19 18:58:05 -07:00
Dirk Dougherty
9d1d6441d9 Doc change: Update froyo mark for home 
Change-Id: Idacecd87faca95cd258436ab842c03102e5fc6c6
 2010-05-19 18:25:33 -07:00
The Android Open Source Project
bc12cd04b8 merge from open-source master 
Change-Id: I0dd123dde8f0da42a99313cffed6a48d30e38381
 2010-05-14 15:52:50 -07:00
Jean-Baptiste Queru
4dccdd6401 Merge "Use a different kernel boot line for the disk installer." 2010-05-14 15:47:56 -07:00
Jean-Baptiste Queru
f81d75ed47 Merge "Use a property to enable the eth0 LAN port on the emulator" 2010-05-14 15:47:39 -07:00
The Android Open Source Project
95f862bcb0 merge from open-source master 
Change-Id: I4ea9aa2765cb634382da92ff17f5af9e2f6b4078
 2010-05-14 14:35:29 -07:00
Jean-Baptiste Queru
f91e9e2729 Merge "Fix "make modules" script bug under Mac OS X." 2010-05-14 14:10:50 -07:00
The Android Open Source Project
9514fca5c7 merge from open-source master 
Change-Id: Ia4cb27645bfd757fb75273ff5a6cbf3af57b3a03
 2010-05-14 13:38:55 -07:00
Jean-Baptiste Queru
5eac957bdd Merge "Updated to better distinguish between options and operands" 2010-05-14 12:21:31 -07:00