Commit Graph

606 Commits

Author SHA1 Message Date
The Android Automerger
e6651747d0 ERD62 2009-12-01 09:06:52 -08:00
The Android Automerger
571855fc07 ERD61 2009-11-30 08:59:47 -08:00
android-build SharedAccount
f8c60fc545 ERD56B 2009-11-25 13:50:30 -08:00
android-build SharedAccount
29c11c5c0f ERD56 2009-11-25 12:34:40 -08:00
android-build SharedAccount
131beb9ce3 ERD55B 2009-11-24 15:26:01 -08:00
The Android Automerger
651ae8571d ERD55 2009-11-24 09:29:38 -08:00
The Android Automerger
714c3f5b38 ERD54 2009-11-23 09:29:31 -08:00
The Android Automerger
06ba5a6f10 Merge branch 'eclair' into eclair-release 2009-11-23 09:28:46 -08:00
The Android Automerger
4c0f7ded71 ERD51 2009-11-20 15:02:37 -08:00
The Android Automerger
e1b3f486d8 Merge branch 'eclair' into eclair-release 2009-11-20 15:02:06 -08:00
Dan Bornstein
bb0c8804dd Add Bluetooth to the test list.
Change-Id: I1e18b76c87a7bba5ef3b4db8ac763bc7d9b6aac6
2009-11-20 13:13:41 -08:00
Android (Google) Code Review
ffbe862d05 Merge change I60b2633b into eclair
* changes:
  Add the JNI test to the CTS list.
2009-11-19 10:43:07 -08:00
The Android Automerger
7555c2714e ERD50 2009-11-19 10:23:44 -08:00
The Android Automerger
30e0de5c9f Merge branch 'eclair' into eclair-release 2009-11-19 10:23:01 -08:00
Android (Google) Code Review
90b35770c2 Merge change If922a88c into eclair
* changes:
  Update version name to 2.1 and API to 7.
2009-11-18 18:17:46 -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
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
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
The Android Automerger
a2a6b2571b ERD49 2009-11-18 08:49:45 -08:00
The Android Automerger
59e6d55d19 Merge branch 'eclair' into eclair-release 2009-11-18 08:48:12 -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
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
The Android Automerger
7e0ddc1578 ERD48 2009-11-17 08:55:24 -08:00
The Android Automerger
ecae0115aa Merge branch 'eclair' into eclair-release 2009-11-17 08:54:55 -08:00
The Android Automerger
0fda10ae76 ERD47B 2009-11-16 18:33:48 -08:00
Adam Bliss
580cdbe0fe Enables nodpi drawables in the framework. 2009-11-16 17:18:40 -08:00
The Android Automerger
abab474650 ERD47 2009-11-16 08:55:20 -08:00
The Android Automerger
46eb8a7edc ERD46 2009-11-15 09:05:43 -08:00
The Android Automerger
94627ed9c1 ERD44B 2009-11-13 13:13:12 -08:00
The Android Automerger
25d24b21aa ERD44 2009-11-13 08:39:33 -08:00
The Android Automerger
21e858e9f1 Merge branch 'eclair' into eclair-release 2009-11-13 08:38:53 -08:00
android-build SharedAccount
57eb67da39 ERD43C 2009-11-12 18:26:33 -08:00
Dianne Hackborn
f6295cdd82 Fix issue #2258571: Fix build versions
Change-Id: I847e8ab8080d5a0716e913da8e176e7dfcd966eb
2009-11-12 15:35:35 -08:00
android-build SharedAccount
682123a5a7 ERD43B 2009-11-12 14:48:10 -08:00
The Android Automerger
ec9ebe7dcb ERD43 2009-11-12 08:33:34 -08:00
The Android Automerger
7390b86396 Merge branch 'eclair' into eclair-release 2009-11-12 08:33:11 -08:00
android-build SharedAccount
ce902a8bcd ERD42B 2009-11-11 15:56:31 -08:00
The Android Automerger
b93a2505db ERD42 2009-11-11 08:36:49 -08:00
The Android Automerger
ea6d7d479d ERD41 2009-11-10 08:46:27 -08:00
The Android Automerger
1bc70f1c48 ERD40 2009-11-09 08:36:49 -08:00
The Android Automerger
59f9869a77 ERD39C 2009-11-08 16:52:31 -08:00
android-build SharedAccount
8a42889364 ERD39B 2009-11-08 15:17:31 -08:00
The Android Automerger
c1e605a15e ERD39 2009-11-08 09:34:54 -08:00
David 'Digit' Turner
2edfb71d01 Support secondary CPU ABI in build.prop
BoardConfig.mk typically defines TARGET_CPU_ABI to the name of the
native machine code CPU ABI supported by the target device. For example,
existing devices today use the value 'armeabi' corresponding to an
ARMv5TE instruction set with soft-float implementation.

This patch allows this file to also define TARGET_CPU_ABI2 to name
a secondary (minor) CPU ABI also supported by the device. This is useful
when the main ABI is ARMv7-A (identified as 'armeabi-v7a') which also
supports ARMv5TE. Such devices should have TARGET_CPU_ABI defined to
'armeabi-v7a' and TARGET_CPU_ABI2 defined to 'armeabi'.

TARGET_CPU_ABI2 will be translated into the ro.product.cpu.abi2 property
in build.prop. This value will be used by the PackageManager to handle
"fat-binaries" generated with the NDK.
2009-11-06 15:12:00 -08:00