tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
1456 commits 1 branch 0 tags 119 MiB
Commit graph

1456 commits

This branch
This branch
All branches
Author SHA1 Message Date
Xavier Ducrohet
b61a97bcdf am 3c5b1842: am 802bb072: am 258b2b45: am 1ae98804: Change where makefile looks for sdk_clean.sh 
Merge commit '3c5b1842ea37cbf6a1c520f32f3782f9a2db406b'

* commit '3c5b1842ea37cbf6a1c520f32f3782f9a2db406b':
  Change where makefile looks for sdk_clean.sh
 2009-11-18 18:01:00 -08:00
Scott Main
8f35bce3ac am 2570dac3: am 7239d522: am ec9baf22: am 9a5c8402: docs: make all javadoc reference links use <code> and remove some unused CSS 
Merge commit '2570dac37bea232ed28b2322beb0407ed19b15f1'

* commit '2570dac37bea232ed28b2322beb0407ed19b15f1':
  docs: make all javadoc reference links use <code>
 2009-11-18 18:00:55 -08:00
Dan Egnor
f711e3494c am 1f816cf5: Merge change I362bebd3 into eclair-mr2 
Merge commit '1f816cf57b93654638989e6007d669c04b3d9b88' into eclair-mr2-plus-aosp

* commit '1f816cf57b93654638989e6007d669c04b3d9b88':
  Include the common source files directly in the framework library
 2009-11-18 17:55:30 -08:00
Raphael
89715318b2 am c3d743d2: am 81d88c31: am d920ec83: Fix a Windows-only discrepency in the Windows SDK build. 
Merge commit 'c3d743d262cd69e817524f8a4e5554ef29ffa837' into eclair-mr2-plus-aosp

* commit 'c3d743d262cd69e817524f8a4e5554ef29ffa837':
  Fix a Windows-only discrepency in the Windows SDK build.
 2009-11-18 17:55:09 -08:00
Raphael
08ab72b351 am 6f5cb991: am f15e028f: am a62a4421: Fix the Windows SDK build for the development to sdk split. 
Merge commit '6f5cb991f61acbc21090c3744d5bf16b01b7aa52' into eclair-mr2-plus-aosp

* commit '6f5cb991f61acbc21090c3744d5bf16b01b7aa52':
  Fix the Windows SDK build for the development to sdk split.
 2009-11-18 17:55:05 -08:00
Xavier Ducrohet
3c5b1842ea am 802bb072: am 258b2b45: am 1ae98804: Change where makefile looks for sdk_clean.sh 
Merge commit '802bb072c2d9efaac1c46ac13d7e69a0aaf936a9' into eclair-mr2-plus-aosp

* commit '802bb072c2d9efaac1c46ac13d7e69a0aaf936a9':
  Change where makefile looks for sdk_clean.sh
 2009-11-18 17:55:02 -08:00
Scott Main
2570dac37b am 7239d522: am ec9baf22: am 9a5c8402: docs: make all javadoc reference links use <code> and remove some unused CSS 
Merge commit '7239d522c59661129850d818fe6986074b6aa002' into eclair-mr2-plus-aosp

* commit '7239d522c59661129850d818fe6986074b6aa002':
  docs: make all javadoc reference links use <code>
 2009-11-18 17:54:57 -08:00
Brett Chabot
fdc0efd29c am 82a36c3b: am b4805a18: am 2779fa7d: Change name of CTS DeviceInfoCollector package to TestDeviceSetup. 
Merge commit '82a36c3b36a3f80b7c2d6ea382af91cc4e2bca32'

* commit '82a36c3b36a3f80b7c2d6ea382af91cc4e2bca32':
  Change name of CTS DeviceInfoCollector package to TestDeviceSetup.
 2009-11-18 17:53:37 -08:00
Jeff Hamilton
698adfc695 am 7b4c42fe: am f1cecce8: Merge change I4414f233 into eclair-mr2 
Merge commit '7b4c42fe2be5c8c3b44f36297743b59396ff25ad'

* commit '7b4c42fe2be5c8c3b44f36297743b59396ff25ad':
  Remove references to com.google.android.gtalkservice.xml.
 2009-11-18 17:52:03 -08:00
Dianne Hackborn
c3e17966b5 Update version name to 2.1 and API to 7. 
Change-Id: If922a88c1f3e99553ec5df9b870713eab1c53c54
 2009-11-18 17:40:17 -08:00
Dan Bornstein
01833fba3b Add the JNI test to the CTS list. 
Change-Id: I60b2633b98ccb06551e521ff229ed12c897cc2e6
 2009-11-18 17:27:10 -08:00
Android (Google) Code Review
1f816cf57b Merge change I362bebd3 into eclair-mr2 
* changes:
  Include the common source files directly in the framework library when building, to allow mutual interdependencies; the common static library will be built independently.
 2009-11-18 17:22:32 -08:00
Raphael
c3d743d262 am 81d88c31: am d920ec83: Fix a Windows-only discrepency in the Windows SDK build. 
Merge commit '81d88c31be80493886e6844ebf8af8a03273208c' into eclair-mr2

* commit '81d88c31be80493886e6844ebf8af8a03273208c':
  Fix a Windows-only discrepency in the Windows SDK build.
 2009-11-18 17:17:54 -08:00
Raphael
6f5cb991f6 am f15e028f: am a62a4421: Fix the Windows SDK build for the development to sdk split. 
Merge commit 'f15e028fe822069e44b0e06fa91f537048538f94' into eclair-mr2

* commit 'f15e028fe822069e44b0e06fa91f537048538f94':
  Fix the Windows SDK build for the development to sdk split.
 2009-11-18 17:17:51 -08:00
Xavier Ducrohet
802bb072c2 am 258b2b45: am 1ae98804: Change where makefile looks for sdk_clean.sh 
Merge commit '258b2b4504949fa95b733b149dd5f8146bfb7887' into eclair-mr2

* commit '258b2b4504949fa95b733b149dd5f8146bfb7887':
  Change where makefile looks for sdk_clean.sh
 2009-11-18 17:17:47 -08:00
Scott Main
7239d522c5 am ec9baf22: am 9a5c8402: docs: make all javadoc reference links use <code> and remove some unused CSS 
Merge commit 'ec9baf22a959af85f77f56360e95a738f360c4f0' into eclair-mr2

* commit 'ec9baf22a959af85f77f56360e95a738f360c4f0':
  docs: make all javadoc reference links use <code>
 2009-11-18 17:17:43 -08:00
Raphael
81d88c31be am d920ec83: Fix a Windows-only discrepency in the Windows SDK build. 
Merge commit 'd920ec8354940653e6cf53a1540360cca3bcc5f7' into eclair

* commit 'd920ec8354940653e6cf53a1540360cca3bcc5f7':
  Fix a Windows-only discrepency in the Windows SDK build.
 2009-11-18 17:12:39 -08:00
Raphael
f15e028fe8 am a62a4421: Fix the Windows SDK build for the development to sdk split. 
Merge commit 'a62a442129a28bf3a62139183868a13b91e976ad' into eclair

* commit 'a62a442129a28bf3a62139183868a13b91e976ad':
  Fix the Windows SDK build for the development to sdk split.
 2009-11-18 17:11:57 -08:00
Xavier Ducrohet
258b2b4504 am 1ae98804: Change where makefile looks for sdk_clean.sh 
Merge commit '1ae988040777f88f766fc421af79a61175e917af' into eclair

* commit '1ae988040777f88f766fc421af79a61175e917af':
  Change where makefile looks for sdk_clean.sh
 2009-11-18 17:11:53 -08:00
Scott Main
ec9baf22a9 am 9a5c8402: docs: make all javadoc reference links use <code> and remove some unused CSS 
Merge commit '9a5c84020595eac7e20fce036a9afd7c06766457' into eclair

* commit '9a5c84020595eac7e20fce036a9afd7c06766457':
  docs: make all javadoc reference links use <code>
 2009-11-18 17:11:50 -08:00
Dan Egnor
81ab3c593a Include the common source files directly in the framework library 
when building, to allow mutual interdependencies; the common static
library will be built independently.
 2009-11-18 15:08:30 -08:00
Brett Chabot
82a36c3b36 am b4805a18: am 2779fa7d: Change name of CTS DeviceInfoCollector package to TestDeviceSetup. 
Merge commit 'b4805a18e51d3a18caa2cac821479a9535778d58' into eclair-mr2-plus-aosp

* commit 'b4805a18e51d3a18caa2cac821479a9535778d58':
  Change name of CTS DeviceInfoCollector package to TestDeviceSetup.
 2009-11-18 14:50:23 -08:00
Brett Chabot
b4805a18e5 am 2779fa7d: Change name of CTS DeviceInfoCollector package to TestDeviceSetup. 
Merge commit '2779fa7d9fea6f61392135a231e69a3e9b89768e' into eclair-mr2

* commit '2779fa7d9fea6f61392135a231e69a3e9b89768e':
  Change name of CTS DeviceInfoCollector package to TestDeviceSetup.
 2009-11-18 14:46:22 -08:00
Brett Chabot
2779fa7d9f Change name of CTS DeviceInfoCollector package to TestDeviceSetup. 
Bug 2099347

Change-Id: Ica876daca8993e8f6eefda6f1a733dcadc92f292
 2009-11-18 14:40:54 -08:00
Raphael
d920ec8354 Fix a Windows-only discrepency in the Windows SDK build. 
For some reason, there's a slight behavior difference between
my Windowss machine and the Windows build servers, that is on
mine the include of framework/base results in duplicate build
rules being defined. My machine used to work like the Windows
build server and the behavior mysteriously changed a while
ago. This change should make it all work the same on all boxes.

Change-Id: I45e02e9eadfc586f86caa6a2690deda9648e600d
 2009-11-18 14:16:04 -08:00
Jeff Hamilton
7b4c42fe2b am f1cecce8: Merge change I4414f233 into eclair-mr2 
Merge commit 'f1cecce82f98d96e564cc44dd01c50909f2d7818' into eclair-mr2-plus-aosp

* commit 'f1cecce82f98d96e564cc44dd01c50909f2d7818':
  Remove references to com.google.android.gtalkservice.xml.
 2009-11-18 13:31:12 -08:00
Android (Google) Code Review
f1cecce82f Merge change I4414f233 into eclair-mr2 
* changes:
  Remove references to com.google.android.gtalkservice.xml.
 2009-11-18 13:26:15 -08:00
Jeff Hamilton
4414f2332b Remove references to com.google.android.gtalkservice.xml. 2009-11-17 23:39:52 -08:00
Dan Egnor
576714fdb9 am 1a0b304f: am 573205f4: Remove external/googleclient (the code moved elsewhere) 
Merge commit '1a0b304faca9a1977f1fe1b44d089a4b01593c81'

* commit '1a0b304faca9a1977f1fe1b44d089a4b01593c81':
  Remove external/googleclient (the code moved elsewhere)
 2009-11-17 23:09:24 -08:00
Raphael
a62a442129 Fix the Windows SDK build for the development to sdk split. 
Change-Id: Iabeee6aa319a3d98d05357f508b190ba65196df7
 2009-11-17 22:12:33 -08:00
Dan Egnor
1a0b304fac am 573205f4: Remove external/googleclient (the code moved elsewhere) 
Merge commit '573205f4838cf0369fd6a7028c793726d1eb8620' into eclair-mr2-plus-aosp

* commit '573205f4838cf0369fd6a7028c793726d1eb8620':
  Remove external/googleclient (the code moved elsewhere)
 2009-11-17 22:00:06 -08:00
Dan Egnor
573205f483 Remove external/googleclient (the code moved elsewhere) 2009-11-17 21:28:09 -08:00
Dan Bornstein
58226c0825 am 39b99e4f: am 34ce5914: resolved conflicts for merge of c3d9645e to eclair-mr2 
Merge commit '39b99e4f593e2af103f6d21bc24776c264ee7ab3'

* commit '39b99e4f593e2af103f6d21bc24776c264ee7ab3':
  Add the example test to the CTS.
 2009-11-17 16:38:57 -08:00
Dan Bornstein
39b99e4f59 am 34ce5914: resolved conflicts for merge of c3d9645e to eclair-mr2 
Merge commit '34ce59147ca68f81a36ab05533a90199147ef3c7' into eclair-mr2-plus-aosp

* commit '34ce59147ca68f81a36ab05533a90199147ef3c7':
  Add the example test to the CTS.
 2009-11-17 16:35:22 -08:00
Dan Bornstein
34ce59147c resolved conflicts for merge of c3d9645e to eclair-mr2 2009-11-17 16:27:02 -08:00
Android (Google) Code Review
c3d9645e29 Merge change I392672f1 into eclair 
* changes:
  Add the example test to the CTS.
 2009-11-17 15:39:46 -08:00
Xavier Ducrohet
1ae9880407 Change where makefile looks for sdk_clean.sh 2009-11-17 15:10:41 -08:00
Dan Bornstein
1347f92e3a Add the example test to the CTS. 
Change-Id: I392672f1767bf72a18058de49c8658dabdc93a4d
 2009-11-17 14:27:40 -08:00
Adam Bliss
cb3e80cd55 am 3a4b4985: am 0774bf3e: am 580cdbe0: Enables nodpi drawables in the framework. 
Merge commit '3a4b4985ed9dafc01fd372474d40ec85bcc7f027'

* commit '3a4b4985ed9dafc01fd372474d40ec85bcc7f027':
  Enables nodpi drawables in the framework.
 2009-11-17 07:35:29 -08:00
Adam Bliss
3a4b4985ed am 0774bf3e: am 580cdbe0: Enables nodpi drawables in the framework. 
Merge commit '0774bf3ebd65c22d8cafb18e868bd2bbc1a0c4c9' into eclair-mr2-plus-aosp

* commit '0774bf3ebd65c22d8cafb18e868bd2bbc1a0c4c9':
  Enables nodpi drawables in the framework.
 2009-11-16 20:00:57 -08:00
Adam Bliss
0774bf3ebd am 580cdbe0: Enables nodpi drawables in the framework. 
Merge commit '580cdbe0fe0dd794c7035d8a406353f88aad827e' into eclair-mr2

* commit '580cdbe0fe0dd794c7035d8a406353f88aad827e':
  Enables nodpi drawables in the framework.
 2009-11-16 19:56:34 -08:00
Adam Bliss
580cdbe0fe Enables nodpi drawables in the framework. 2009-11-16 17:18:40 -08:00
Jean-Baptiste Queru
9ecac945c1 am efe211de: merge from open-source master 
Merge commit 'efe211de2fd3b7c427e69496c708542d660d29c0'

* commit 'efe211de2fd3b7c427e69496c708542d660d29c0':
  eclair snapshot
 2009-11-15 15:03:23 -08:00
Jean-Baptiste Queru
efe211de2f merge from open-source master 2009-11-15 14:55:00 -08:00
Jean-Baptiste Queru
4a1dcd3c3c merge from open-source master 
Merge commit 'goog/stage-korg-master' into HEAD
 2009-11-15 14:05:55 -08:00
Jean-Baptiste Queru
57556ffcc3 merge from eclair 2009-11-15 12:05:33 -08:00
Jean-Baptiste Queru
8a9098d4fb am 905da31a: merge from open-source master 
Merge commit '905da31a24479c559f88dfb46fb6dc94fb5c42b3'

* commit '905da31a24479c559f88dfb46fb6dc94fb5c42b3':
  Cosmetic fixes in css/js
 2009-11-15 11:30:42 -08:00
Jean-Baptiste Queru
905da31a24 merge from open-source master 2009-11-15 10:58:56 -08:00
Christopher Tate
87cffba830 am 218c6d34: am 014b8e03: am eb71bf7b: Merge change I01d9d733 into eclair 
Merge commit '218c6d3464c6e5c75765d59fbc42bb8357d88a1d'

* commit '218c6d3464c6e5c75765d59fbc42bb8357d88a1d':
  Add a host shell function to generate system_server stack traces
 2009-11-13 10:55:33 -08:00
Dianne Hackborn
73053721a0 am 26542574: am 8feaa2b6: am d0b22902: Merge change I847e8ab8 into eclair 
Merge commit '265425746b50ddb14467b2bdbd62f3424b7176f0'

* commit '265425746b50ddb14467b2bdbd62f3424b7176f0':
  Fix issue #2258571: Fix build versions
 2009-11-13 10:55:29 -08:00