pa-fazil
/
android_build
mirror of https://github.com/fazilsheik96/android_build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,942 Commits 3 Branches 0 Tags 112 MiB
Commit Graph

2942 Commits

Author SHA1 Message Date
Ying Wang 9a5418bba5 resolved conflicts for merge of f83fd362 to master 
Change-Id: I527111ec1461e258b4911a2aaa90100eceacea80
 2010-06-09 11:48:48 -07:00
Ying Wang f83fd362a9 am 66356cef: am 7a794289: Merge "Unbundle the build system." into froyo 2010-06-09 11:35:32 -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 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
Eric Laurent 452c31bc2d Added prelinked library for audio effects JNI. 
Change-Id: Ic3d26cedbff599c3ee6fed080b64fce5375ea940
 2010-06-09 06:51:12 -07:00
The Android Automerger 066933bbae FRF69C 
Change-Id: Ied558c99dc92e0fdbf888e507cd8c35ac210b51e
 2010-06-08 17:57:58 -07:00
The Android Automerger a0737f734f FRF69B 
Change-Id: Ia90d822a9a271e729d3525c8aed6518746a118bf
 2010-06-08 17:10:25 -07:00
The Android Automerger 469ffc607e Merge branch 'froyo' into froyo-release 2010-06-08 17:10:05 -07:00
The Android Automerger 626d7ae7d4 FRF69 
Change-Id: Id46f5d68895e92ebb51047a608c7f779aeab7f46
 2010-06-08 14:09:14 -07:00
Jeff Hamilton a4db49fc57 am a207ba0d: am 02fc6267: am 04be0d86: Set JAVA_HOME to point to java 1.5. 2010-06-08 14:07:47 -07:00
Jeff Hamilton a207ba0dec am 02fc6267: am 04be0d86: Set JAVA_HOME to point to java 1.5. 2010-06-08 14:05:52 -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 02fc62673e am 04be0d86: Set JAVA_HOME to point to java 1.5. 
Merge commit '04be0d869acce82293b6c668f52bddf14c106908' into kraken

* commit '04be0d869acce82293b6c668f52bddf14c106908':
  Set JAVA_HOME to point to java 1.5.
 2010-06-08 14:04:28 -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 Automerger 4117a8bf8a FRF68 
Change-Id: Iafa754a31276d3658c45a424d86b9a73d6618fe1
 2010-06-07 22:05:04 -07:00
Roman Nurik 78eff9f5bd Revamp resources listing, part 2 (droiddoc). 
- Fix docs navigation JS to correctly handle pages with query strings (i.e. browser.html?tag=article)
- Add resource browser CSS and JS to complement browser.jd in frameworks/base.
- Add microtemplate.js library for ease HTML templates in JS.

Change-Id: I518eeb5fc5a05dc6775eb3870eb88ebb0fc7b72c
 2010-06-04 10:51:02 -07:00
The Android Open Source Project b9e8f1f089 am d29b9bef: am c2f5c096: am 4873d8f5: (-s ours) merge from open-source master 2010-06-04 09:56:12 -07:00
The Android Open Source Project d29b9bef39 am c2f5c096: am 4873d8f5: (-s ours) merge from open-source master 2010-06-04 09:54:51 -07:00
The Android Open Source Project c2f5c0964b am 4873d8f5: (-s ours) merge from open-source master 
Merge commit '4873d8f5ca9fecc9c826ad383befbefb3407296b' into kraken

* commit '4873d8f5ca9fecc9c826ad383befbefb3407296b':
  Build host tools as 32bit on all Darwin machines.
 2010-06-04 09:53:20 -07:00
The Android Open Source Project 4873d8f5ca merge from open-source master 
Change-Id: Id3161ac44e0eaba0184b3d2d4af43e4e40d26e90
 2010-06-04 07:56:24 -07:00
The Android Automerger 4844bb5231 FRF64 
Change-Id: I791a6e152fa97089042deeb0260ba70c8bf0eabc
 2010-06-03 16:21:19 -07:00
The Android Automerger 819cc02d98 Merge branch 'froyo' into froyo-release 2010-06-03 16:21:06 -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 858e4d5ba2 am ebc2869b: Build host tools as 32bit on all Darwin machines. 2010-06-03 13:10:54 -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
Joe Onorato 7a0b78b6b9 am a65ecab3: am 13a90e3a: Add SystemUI.apk to the generic build. 2010-06-02 22:41:24 -07: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
Andy McFadden 528a605567 am eabec90b: am f8e9fb3b: Merge "Atomic/SMP update." into kraken 2010-06-02 22:35:14 -07:00
Ying Wang 298d0087a6 am 5cceb024: (-s ours) am f33c3ef9: am b93e03cb: am 52911309: Cherry-pick unbundled build changes from master 2010-06-02 22:35:12 -07:00
Joe Onorato a65ecab37a am 13a90e3a: Add SystemUI.apk to the generic build. 2010-06-02 16:29:33 -07:00
Joe Onorato 13a90e3a20 Add SystemUI.apk to the generic build. 
Change-Id: I03d92d93fbcb51808a096fb7d48c1b693efa777d
 2010-06-02 14:48:35 -07:00
Ying Wang 2e684553a9 am eee01787: am e8ffa149: am ba16a89d: Override LOCAL_CERTIFICATE in inherit-package. 2010-06-02 14:40:32 -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
Andy McFadden eabec90bab am f8e9fb3b: Merge "Atomic/SMP update." into kraken 2010-06-02 13:47:41 -07:00
Andy McFadden f8e9fb3b2a Merge "Atomic/SMP update." into kraken 2010-06-02 13:46:11 -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 5cceb024c3 am f33c3ef9: am b93e03cb: am 52911309: Cherry-pick unbundled build changes from master 2010-06-02 13:13:32 -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
Andy McFadden 5f2b36f854 Atomic/SMP update. 
Added "TARGET_CPU_SMP := true" to simulator configuration, since it's
likely the simulator will be running on SMP hardware.

Change-Id: I7527895abe70ffaece5c52fd3ffcfe4b0d698fd2
 2010-06-01 08:37:16 -07:00
Joe Onorato 09082d120e am 8a06bac1: Make make ECLIPSE-lunch build a .classpath for all the java stuff that will be included in the build. 2010-05-31 19:06:18 -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