Commit Graph

22765 Commits

Author SHA1 Message Date
Dianne Hackborn
93b016008f Add native include path.
Change-Id: Ic5d0b807467e8e673399a8a5f9b6702bc72960ab
2010-05-04 18:08:21 -07:00
Jesse Wilson
3600a1604a Undo commit: Moving junit out of core.jar and into core-junit.jar
Change-Id: I09875ef5f45b1d643ae389a6871cad374d80746b
2010-05-04 17:27:15 -07:00
Jesse Wilson
72c941a147 Moving junit out of core.jar and into core-junit.jar.
Also extending the arbitrary limit on build argument sizes,
which I ran up against in building after this change.

Change-Id: Iba79a37b27e7d5efa2b02a99aa253a2eec7ede75
2010-05-04 16:33:49 -07:00
The Android Open Source Project
eaf130ec2c am 58248935: am cf28b803: am ae4e1455: merge from open-source master 2010-05-03 16:16:25 -07:00
The Android Open Source Project
cf28b80398 am ae4e1455: merge from open-source master
Merge commit 'ae4e14556bb3a789c4263ebba7ed42b3035e13f6' into kraken

* commit 'ae4e14556bb3a789c4263ebba7ed42b3035e13f6':
  Adapt to new location of libcore
  Make expr more POSIXy
  generic_x86 support
  Remove obsolete machine-setup.html reference.
2010-05-03 16:13:22 -07:00
The Android Open Source Project
ae4e14556b merge from open-source master
Change-Id: I3d24628d38c99369f242733d9089d7c5669a4623
2010-05-03 16:11:04 -07:00
Ying Wang
5b59f6b08c Use sdk as the bootstrap classpath while compiling against sdk.
Change-Id: Iad16b8c03d88d138abee5e24433b6a654fa21410
http://b/issue?id=2623361
2010-05-03 09:47:12 -07:00
Jean-Baptiste Queru
045d4af72d Adapt to new location of libcore
Change-Id: Ibabfe907f00522c1966ddc333352eaea2bdcb5bd
2010-04-30 13:22:56 -07:00
Jean-Baptiste Queru
60bc203660 Adapt to new location of libcore
Change-Id: I17a2f432f69bd0cb381e83b6395fb2ae6e4faf9d
2010-04-30 13:10:03 -07:00
Jean-Baptiste Queru
aa000340af Adapt to new location of libcore
Change-Id: Ib32222c3541b2aa66df6d6a5519049653647aae7
2010-04-30 12:08:06 -07:00
Evan JIANG
f380692430 Fix "make modules" script bug under Mac OS X.
For Mac OS uses BSD sed, it doesn't support "\n". Then, "make modules"
command cannot work correctly under Mac OS. Using tr command to replace
sed command, it has the same behavior under both Mac OS and Linux.

Change-Id: I29e044cc66bf24f6459cbb33164fd9f55f772e3c
2010-04-28 16:13:28 -07:00
The Android Open Source Project
df55739f49 am 345cbd2d: am cd0bd801: merge from open-source master 2010-04-28 16:07:06 -07:00
The Android Open Source Project
345cbd2d25 am cd0bd801: merge from open-source master
Merge commit 'cd0bd8011bb955e8ffab9e77180ce2b23ba7e923' into kraken

* commit 'cd0bd8011bb955e8ffab9e77180ce2b23ba7e923':
  Fix "make layoutlib" under Windows+Cygwin
2010-04-28 15:58:23 -07:00
The Android Open Source Project
cd0bd8011b merge from open-source master
Change-Id: Ie49d1b19914fcfefedfdfc070800426d4b13dd46
2010-04-28 15:55:08 -07:00
Ying Wang
ee43a90f4f Merge "Dist only if the goal is to be built" 2010-04-28 15:45:58 -07:00
Raphael Moll
bfa25878f9 Remove obsolete machine-setup.html reference.
Bug 1231

Change-Id: I629361cf5dddc9d0fbf493e016f1aaf2a50b6935
2010-04-28 14:30:44 -07:00
Ying Wang
a37a2cb231 Dist only if the goal is to be built
Change-Id: I1b794f36a6dc39ce68cc990b967d2d55118c92ca
http://b/issue?id=2635603
2010-04-28 12:59:51 -07:00
Brett Chabot
3fcf6020d3 Merge "Add CTS tests for the accessibility APIs. (make)" 2010-04-27 15:46:55 -07:00
Nick Kralevich
19f5d7db96 am 387e4d06: LOCAL_LDFLAGS should come after TARGET_GLOBAL_LDFLAGS 2010-04-26 15:16:49 -07:00
Nick Kralevich
387e4d0601 LOCAL_LDFLAGS should come after TARGET_GLOBAL_LDFLAGS
A package can define a LOCAL_LDFLAGS.  If a LOCAL_LDFLAGS
exists, it should come after the global LDFLAGS, to allow
the local flags to override the global flags.

Change-Id: I6e44c17949c1f11c808d0ed3f327d63fb51a1468
2010-04-26 14:12:19 -07:00
Ying Wang
ee79711322 Add ramdisk to dist. [DO NOT MERGE]
cherry-pick from master.
http://b/issue?id=2590492

Change-Id: I1a8f0313a486665847b27fb58ac9a57881d5e913
2010-04-26 11:27:55 -07:00
Guang Zhu
0198d6ebb4 collect emm meta files for emma instrumented build
when doing 'make dist', with EMMA_INSTRUMENT on the coverage.em files
generated for each module will be collected into one emma_meta.zip file

Change-Id: I382c39a97005e6cae5c79ad7eaef1c8857f658af
2010-04-26 11:26:55 -07:00
Svetoslav Ganov
08430d5350 Add CTS tests for the accessibility APIs. (make)
Change-Id: I4cdf7639412e1fcea0f4ee29f79e2868408cf9a1
2010-04-23 17:40:29 -07:00
Raphael
649c4731b1 am 381ee392: am 9ca1628e: Support building Windows SDK under Linux.
Merge commit '381ee392e8ebba35cb65321415f4cdb537b446ed' into kraken

* commit '381ee392e8ebba35cb65321415f4cdb537b446ed':
  Support building Windows SDK under Linux.
2010-04-23 17:21:48 -07:00
Ying Wang
8b9b39e995 Add phony target to build and dist sample code.
See http://b/issue?id=2468418
After this CL, add "samplecode" to your make goals, you will get the sample apks
built and installed at out/target/common/samples/.

Change-Id: Iff83f2ba6b6c2fe6ac1c78ca4a9d4bc6953dac8a
2010-04-23 13:57:07 -07:00
Ying Wang
929cdf3313 Add ramdisk.img to the dist dir.
Change-Id: Ia74c501298010734dd1b8db8df86720d3e8bb7cd
http://b/issue?id=2590492
2010-04-23 13:39:40 -07:00
Raphael
9ca1628e3f Support building Windows SDK under Linux.
- envsetup.mk & config.mk: we define a new BUILD_OS and a minimal set
of things like BUILD_OUT to be able to use some local tools when
doing cross-compilation. This allows us to use the Linux version of
ACP when cross-compiling the tools to Windows.

- Makfile: include windows_sdk.mk when needed to build a Windows SDK.

- main.mk: support a win_sdk target (e.g. PRODUCT-sdk-win_sdk)

(Merge master Change I9d08d0df)
2010-04-23 13:17:23 -07:00
Raphael
3d224a0fc9 Support building Windows SDK under Linux.
- envsetup.mk & config.mk: we define a new BUILD_OS and a minimal set
of things like BUILD_OUT to be able to use some local tools when
doing cross-compilation. This allows us to use the Linux version of
ACP when cross-compiling the tools to Windows.

- Makfile: include windows_sdk.mk when needed to build a Windows SDK.

- main.mk: support a win_sdk target (e.g. PRODUCT-sdk-win_sdk)

Change-Id: I9d08d0df598b8a7292532d23c55f48101a95a240
2010-04-23 10:06:41 -07:00
Dianne Hackborn
b1ae8ab97d Merge "Mmmmmm... Gingerbread!" 2010-04-22 16:24:19 -07:00
Doug Zongker
6717059ccc don't use the -m option when building OTA packages any more
The -m option no longer exists; we only support one OTA package script
language in gingerbread.

Change-Id: I9b532a30f8c3b297b8ffdb2a570a24db37f056d1
2010-04-21 14:53:07 -07:00
Ying Wang
3533eca851 Add build number to apks by appending it to versionName.
Change-Id: I476ff3514068814211d67e8ed956f1923be33bcd
http://b/issue?id=2557312
2010-04-21 10:23:42 -07:00
Guang Zhu
155afe393f enhancement for building app with emma code coverage
* global filter to avoid applying instrumentation on emma classes
* remove local variable information at dex step instead of compile time

Change-Id: If04c27bc717f34816077a98ead9ceb0dbcbb0d2f
2010-04-20 13:38:49 -07:00
Kenny Root
a51b76e15b Merge "Add subdir under frameworks/base for code ported from icu4j." 2010-04-20 10:21:02 -07:00
Dianne Hackborn
d6f9929f4a Mmmmmm... Gingerbread!
Change-Id: I1ad5293d5b35eaa34107d9112266ac28d1269925
2010-04-19 15:09:47 -07:00
Brad Fitzpatrick
c01c284dda am 492adf41: am dc5f3888: am 135677a7: For userdebug builds, enable Dalvik lock contention sampling. 2010-04-19 11:49:25 -07:00
Brad Fitzpatrick
492adf4169 am dc5f3888: am 135677a7: For userdebug builds, enable Dalvik lock contention sampling.
Merge commit 'dc5f3888d092310f1bb7f0d26be05d4b4cef6b91' into kraken

* commit 'dc5f3888d092310f1bb7f0d26be05d4b4cef6b91':
  For userdebug builds, enable Dalvik lock contention sampling.
2010-04-19 11:40:48 -07:00
Brad Fitzpatrick
135677a718 For userdebug builds, enable Dalvik lock contention sampling.
Change-Id: I75cca6fc0ac0d0adfc059a8f82b2f6ae584361f3
2010-04-19 07:51:12 -07:00
Dianne Hackborn
472e07c8f4 am cc45ee9c: On to Kraken... 2010-04-15 16:59:38 -07:00
Dianne Hackborn
cc45ee9c3c On to Kraken...
Change-Id: Ib5f57d8095a0e88fdbbc933ccb2ea0c6d83010ae
2010-04-15 14:06:28 -07:00
Raphael Moll
7058f499e9 Fix "make layoutlib" under Windows+Cygwin
Change-Id: I5277afe77f1e3367ecfd0933a9ab14a5a42c2be2
2010-04-13 10:49:29 -07:00
Dianne Hackborn
7d25429b67 am f2a1c24d: am 966c7355: am 303b3412: Add clean step for SDK version change. 2010-04-07 14:38:15 -07:00
Dianne Hackborn
f2a1c24dd1 am 966c7355: am 303b3412: Add clean step for SDK version change.
Merge commit '966c7355c3705095532bcc71ae6d893bdbe3531d' into kraken

* commit '966c7355c3705095532bcc71ae6d893bdbe3531d':
  Add clean step for SDK version change.
2010-04-07 14:31:10 -07:00
Dianne Hackborn
303b34121e Add clean step for SDK version change.
Change-Id: I2ea85496af49572115dbbd9a98787b1fd54adc50
2010-04-07 14:13:47 -07:00
Shih-wei Liao
5702120438 Merge "Add libbcc.so" 2010-04-07 12:26:16 -07:00
Joe Onorato
e0a18a75a9 Finish moving the policies out of frameworks/policies/base and into frameworks/base.
Change-Id: I6b3991de3276258318cab2aff9651f18b3d07f85
2010-04-06 20:21:29 -05:00
Doug Felt
05d275837c Add subdir under frameworks/base for code ported from icu4j.
Change-Id: I6c9fa6dac1f80bbaf8c80b9e0900f4e628ff596f
2010-04-05 14:00:48 -07:00
Dianne Hackborn
efba0b9829 It's beginning to look a lot like release time!
Everywhere we build...

Froyo is now Android 2.2, API 8.

This breaks the YouTube prebuilt (yay prebuilts!) but little else.
Does this mean we are becoming mature?

Change-Id: I15d228d57853a0dfabc47dda253d55339a5b3d17
2010-04-05 12:33:11 -07:00
Ying Wang
139e33243b Add symbols.zip and build.prop to sdk dist.
Change-Id: I667f5ef847a6e8e78c6b3df5c2b092bb5d863955
http://b/issue?id=2394164
2010-03-31 17:29:04 -07:00
Ying Wang
6714dbc236 Add comments for ANDROID_BUILD_SHELL
Change-Id: I71f0a1a08b097cd179bbcb684a9114267f9bf0db
2010-03-30 16:42:15 -07:00
Ying Wang
2ce495a0a7 Allow use of alternative to bash as the build shell.
Change-Id: Ib92217f90c98e04a1d16efd4904d9d7ba9dda3cf
http://b/issue?id=2557214
2010-03-30 12:55:13 -07:00