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
Eric Laurent
82a93b76a8 am a67baff9: am 71affe70: am 484d4d54: Merge "Added prelinked library for audio effects JNI." into kraken 
Merge commit 'a67baff9a50be3a335e650d208d51e33e20b70e2'

* commit 'a67baff9a50be3a335e650d208d51e33e20b70e2':
  Added prelinked library for audio effects JNI.
 2010-06-14 09:40:05 -07:00
Eric Laurent
a67baff9a5 am 71affe70: am 484d4d54: Merge "Added prelinked library for audio effects JNI." into kraken 
Merge commit '71affe70fd8f882c7c9cc7a5aca28e714241eb6e' into gingerbread-plus-aosp

* commit '71affe70fd8f882c7c9cc7a5aca28e714241eb6e':
  Added prelinked library for audio effects JNI.
 2010-06-14 09:38:16 -07:00
Eric Laurent
71affe70fd am 484d4d54: Merge "Added prelinked library for audio effects JNI." into kraken 
Merge commit '484d4d5470336b662a5e65a1f10653c4c433cf84' into gingerbread

* commit '484d4d5470336b662a5e65a1f10653c4c433cf84':
  Added prelinked library for audio effects JNI.
 2010-06-14 09:37:15 -07:00
Eric Laurent
484d4d5470 Merge "Added prelinked library for audio effects JNI." into kraken 2010-06-14 09:35:24 -07:00
Raphael
63c8af9aaf Fix the build: properly detect the BUILD OS version of Java, not the host one. 
This matters when building Windows under Linux.

Change-Id: I1eaa4eeda4df359313f16d52605a1b8298765269
 2010-06-12 11:44:48 -07:00
Ed Heyl
b55b07fef7 am e46a061d: am d7e7e482: am d83f3396: Revert "Merge "Switch the required host Java environment to 1.6." into kraken" 
Merge commit 'e46a061d08f9667783d39a60106003497c2ad41e'

* commit 'e46a061d08f9667783d39a60106003497c2ad41e':
  Revert "Merge "Switch the required host Java environment to 1.6." into kraken"
 2010-06-11 15:30:54 -07:00
Ed Heyl
e46a061d08 am d7e7e482: am d83f3396: Revert "Merge "Switch the required host Java environment to 1.6." into kraken" 
Merge commit 'd7e7e4825293f5b623e07f854d7ed2e3470be586' into gingerbread-plus-aosp

* commit 'd7e7e4825293f5b623e07f854d7ed2e3470be586':
  Revert "Merge "Switch the required host Java environment to 1.6." into kraken"
 2010-06-11 15:29:06 -07:00
Ed Heyl
d7e7e48252 am d83f3396: Revert "Merge "Switch the required host Java environment to 1.6." into kraken" 
Merge commit 'd83f33969aa2734000338e01b84957996ef1bb34' into gingerbread

* commit 'd83f33969aa2734000338e01b84957996ef1bb34':
  Revert "Merge "Switch the required host Java environment to 1.6." into kraken"
 2010-06-11 15:27:29 -07:00
Ed Heyl
d83f33969a Revert "Merge "Switch the required host Java environment to 1.6." into kraken" 
This reverts commit 1f29d2c376, reversing
changes made to f9f513ab33.
 2010-06-11 15:22:42 -07:00
Sriram Raman
19b9aa3cd1 am ec1c20a7: am 6ad4e499: am 1f29d2c3: Merge "Switch the required host Java environment to 1.6." into kraken 
Merge commit 'ec1c20a7077a0afb476f8ca2b290e7a01c002b1d'

* commit 'ec1c20a7077a0afb476f8ca2b290e7a01c002b1d':
  Switch the required host Java environment to 1.6.
 2010-06-11 12:34:09 -07:00
Sriram Raman
ec1c20a707 am 6ad4e499: am 1f29d2c3: Merge "Switch the required host Java environment to 1.6." into kraken 
Merge commit '6ad4e499a6f9c0477ef430ba4ca73df533f6cadc' into gingerbread-plus-aosp

* commit '6ad4e499a6f9c0477ef430ba4ca73df533f6cadc':
  Switch the required host Java environment to 1.6.
 2010-06-11 12:30:53 -07:00
Sriram Raman
6ad4e499a6 am 1f29d2c3: Merge "Switch the required host Java environment to 1.6." into kraken 
Merge commit '1f29d2c376295cb7ba909ae2beb4904099546e89' into gingerbread

* commit '1f29d2c376295cb7ba909ae2beb4904099546e89':
  Switch the required host Java environment to 1.6.
 2010-06-11 12:28:12 -07:00
Sriram Raman
1f29d2c376 Merge "Switch the required host Java environment to 1.6." into kraken 2010-06-11 12:24:53 -07:00
Ying Wang
df249af6b6 am 74a9fd08: am a07d37b7: Cherry-pick bug fixes from master. 
Merge commit '74a9fd08731f78516a6c0e81169c8e8ff7a6d9c1' into gingerbread-plus-aosp

* commit '74a9fd08731f78516a6c0e81169c8e8ff7a6d9c1':
  Cherry-pick bug fixes from master.
 2010-06-11 09:08:57 -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
Ying Wang
74a9fd0873 am a07d37b7: Cherry-pick bug fixes from master. 
Merge commit 'a07d37b79300e76da5f21f532578fcd686a74b16' into gingerbread

* commit 'a07d37b79300e76da5f21f532578fcd686a74b16':
  Cherry-pick bug fixes from master.
 2010-06-11 09:04:43 -07:00
Ed Heyl
f03c9acfec fix platform name 
Change-Id: Ic6507f94887ead4d710a3da85582d49a2d9b8f24
 2010-06-11 02:50:18 -07:00
Ed Heyl
4977caa700 am 1d2c25b7: kraken --> gingerbread 
Merge commit '1d2c25b7804e6fcee213b5ed81594f48c563e2eb' into gingerbread-plus-aosp

* commit '1d2c25b7804e6fcee213b5ed81594f48c563e2eb':
  kraken --> gingerbread
 2010-06-11 02:08:47 -07:00
Ed Heyl
1d2c25b780 kraken --> gingerbread 
Change-Id: I7710134ec026b9c494fe2912809607c162b5ac51
 2010-06-11 02:06:03 -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
Jean-Baptiste Queru
75f5e39f40 am 8ce07fab: merge from froyo-plus-aosp 2010-06-09 15:58:46 -07:00
Jean-Baptiste Queru
8ce07fabb6 merge from froyo-plus-aosp 
Change-Id: Ie085dd2e50a68bb79699f98d31ef8ceb0fe8d339
 2010-06-09 15:56:15 -07:00
Jeff Hamilton
76478e8ce6 am f597c7be: am f9f513ab: Merge "Make the Java version check non-fatal to aid in the switch to 1.6 on the build servers." into kraken 2010-06-09 15:44:33 -07:00
Jeff Hamilton
f9f513ab33 Merge "Make the Java version check non-fatal to aid in the switch to 1.6 on the build servers." into kraken 2010-06-09 15:40:36 -07:00
Jeff Hamilton
d41c06539c Switch the required host Java environment to 1.6. 
Change-Id: Ic289e35a747b6f462816aca159acba6d400829c9
 2010-06-09 17:01:04 -05:00
Jeff Hamilton
e4fb7ccd9b Make the Java version check non-fatal to aid in the switch to 1.6 on the build servers. 
Change-Id: Ieb0779ef54cdfa921a8dbfb1041536f8969d22e4
 2010-06-09 16:56:39 -05: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
9a5418bba5 resolved conflicts for merge of f83fd362 to master 
Change-Id: I527111ec1461e258b4911a2aaa90100eceacea80
 2010-06-09 11:48:48 -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
66356cef22 am 7a794289: Merge "Unbundle the build system." into froyo 
Merge commit '7a7942899eedde3b946768a155fac3d70af5c9c3' into kraken

* commit '7a7942899eedde3b946768a155fac3d70af5c9c3':
  Unbundle the build system.
 2010-06-09 11:33:32 -07:00
Ying Wang
0f6f4ca54e Unbundle the build system. 
Change-Id: I88912d876c3972212e8871b3e5b3b8b6d2da34d0
 2010-06-09 10:26:26 -07:00
Eric Laurent
452c31bc2d Added prelinked library for audio effects JNI. 
Change-Id: Ic3d26cedbff599c3ee6fed080b64fce5375ea940
 2010-06-09 06:51:12 -07: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
Jeff Hamilton
7c8b1dd3c3 am 858e4d5b: am ebc2869b: Build host tools as 32bit on all Darwin machines. 2010-06-03 13:12:32 -07:00
Jeff Hamilton
ebc2869b8d Build host tools as 32bit on all Darwin machines. 
Change-Id: I121b388056e68b787518c66a01c172bc4ffaef9b
 2010-06-03 12:29:19 -05:00
Ying Wang
12a77ba4c6 am 2e684553: am eee01787: am e8ffa149: am ba16a89d: Override LOCAL_CERTIFICATE in inherit-package. 2010-06-02 22:35:33 -07:00
Ying Wang
eee0178732 am e8ffa149: am ba16a89d: Override LOCAL_CERTIFICATE in inherit-package. 
Merge commit 'e8ffa1490023eff03335b550c582eaadd3a4561b' into kraken

* commit 'e8ffa1490023eff03335b550c582eaadd3a4561b':
  Override LOCAL_CERTIFICATE in inherit-package.
 2010-06-02 14:38:43 -07: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
f33c3ef933 am b93e03cb: am 52911309: Cherry-pick unbundled build changes from master 
Merge commit 'b93e03cbc9d47a9d9a385c780ed64639e2a23ae5' into kraken

* commit 'b93e03cbc9d47a9d9a385c780ed64639e2a23ae5':
  Cherry-pick unbundled build changes from master
 2010-06-02 13:11:32 -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
Joe Onorato
368c640b14 am 09082d12: am 8a06bac1: Make make ECLIPSE-lunch build a .classpath for all the java stuff that will be included in the build. 2010-06-01 16:09:51 -07:00
Brian Carlstrom
d05d74b2d6 Fix "make cts" for refactored libcore 
Change-Id: I718ee82681a4989205118d3e828567971e5f1849
 2010-05-28 22:42:33 -07:00
Brian Carlstrom
b6a08f0cd3 Deleting test builds obsoleted by libcore reorg 
Change-Id: Ia8f5984e5ba03d1429c31c48d098cb044305cab1
 2010-05-28 17:02:57 -07:00
Ying Wang
e4b24ebab8 Fix "argument list too long" 
Bug http://b/issue?id=2718472

Change-Id: I07eaf0d9dff2fa7c86f59bc50fb3b28516642301
 2010-05-27 14:41:31 -07:00
Joe Onorato
8a06bac1db Make make ECLIPSE-lunch build a .classpath for all the java stuff that will be included in the 
build.

Change-Id: I5a6066fa2afc9cb7bea794770bbb589615a1f9eb
 2010-05-26 17:58:21 -04:00