Commit graph

638 commits

Author SHA1 Message Date
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
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
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
Shih-wei Liao
5db9b5af0d Add libbcc.so
Change-Id: I8ef01a8ed647e5012d27e3c048fc1f4ee5a5e03a
2010-03-26 16:32:08 -07:00
Ying Wang
910dcbebc0 Cherry-pick 6f1c75849c4b101b55ae624755e43293724ce76e from eclair
Change-Id: I21a69669935d838595b2fa01c5be10e6c1975da9
2010-03-24 23:22:33 -07:00
Ying Wang
9a6a1e33b3 Add android-info.txt to the dist dir.
Change-Id: I735655205085b0baf490b0dd011eb59cb6d4c45b
http://b/issue?id=2524072
2010-03-17 17:07:39 -07:00
Ying Wang
8c254825a0 Support to override instr target package in inherit-package
http://b/issue?id=2451361
With this CL, you can inherit a testing package to test a inheriting package.
Note: we change the meaning of $(5), so we need to change any existing calls
to inherit-package in other projects.

Change-Id: I673155d1b8b6006953d14e1ab87066536ebd1e54
2010-03-16 17:08:58 -07:00
Doug Zongker
283e2a1e1b store filesystem config info in target files at build time
Store a dump of the desired uid/gid/mode for every system file in the
target_files zip.  Modify ota_from_target_files to use this stored
information when it is available, instead of running fs_config from
the current client (which might be out of sync from the one where the
target_files zip was built).

b/2516887 - New android_filesystem_config.h needed

Change-Id: I8409a0265d1d50daad9c2bc033c99b74b8931b20
2010-03-15 18:04:15 -07:00
Colin Cross
6e6824c4ce Merge changes Ib3b44e83,I70d50928
* changes:
  Add a new build target armv7-a-neon
  Modify the armv7-a target arch to not use NEON
2010-03-10 18:14:03 -08:00
Ying Wang
1873e44d58 Merge "Don't force localization for package tagged as tests." 2010-03-10 16:20:32 -08:00
Colin Cross
f807c55f39 Add a new build target armv7-a-neon
Change-Id: Ib3b44e839b093974aff0d595950e6b691beee7a5
2010-03-10 16:07:14 -08:00
Colin Cross
5720bb91a4 Modify the armv7-a target arch to not use NEON
To build for a target with NEON, use armv7-a-neon

Change-Id: I70d509287b04c0faebe44faf6c8ebb28a7360ff9
2010-03-10 16:06:44 -08:00
Ying Wang
c61d5932d3 Don't force localization for package tagged as tests.
Change-Id: I612598443371fc388cf08ddde7ebdd1d3dec9c7e
2010-03-10 16:02:42 -08:00
Ying Wang
08e3883350 Merge "Let Proguard load emma jar if it's enabled." 2010-03-10 13:36:42 -08:00
Ying Wang
389b7e11e4 Let Proguard load emma jar if it's enabled.
Change-Id: I57a0bcfb486339f48dc25f5fc5d44a1178dee678
See: http://b/issue?id=2502181
2010-03-09 17:24:32 -08:00
Bjorn Bringert
4f85d00113 Make ProGuard keep @VisibleForTesting classes and methods
Change-Id: I7f5d14fd4188859c52ab85c33af1ac275888611c
2010-03-09 14:37:21 +00:00
The Android Open Source Project
d2e571cb55 merge from open-source master
Change-Id: I9fedeb014c946b53bfdd424b00c0cb5fc08f8333
2010-03-08 17:16:23 -08:00
Andy McFadden
99e087bc82 Added -lpthread to target LDFLAGS for sim-eng.
This adds "-lpthread" to TARGET_GLOBAL_LDFLAGS when TARGET_SIMULATOR
is true.  This is much easier than inserting it into individual
makefiles as needed.  Has no effect on other builds.

Should fix the sim-eng build breakage in libcameraservice.

Change-Id: I4dcd7d54b93d1be1622b8ce78a1662d28ca9f9f2
2010-03-08 12:42:46 -08:00
Dan Egnor
ab2b1db4f8 Cleanspec rules to take care of old (pre-static) libraries.
(The build system doesn't react gracefully when something is switched
from a shared library to a static library.)
2010-03-05 15:31:49 -08:00
Andrew Stadler
221cdbb17d Fix builds due to Music2 moving around. 2010-03-05 12:45:52 -08:00
Jean-Baptiste Queru
048683ea7e Merge from eclair
Change-Id: I4496dadd8a738a05c647589ca78732e9b608ca29
2010-03-05 07:23:14 -08:00
Jean-Baptiste Queru
4eb079f67f Look for product configs in device/ in addition to vendor/
This will allow to create open-sourceable product configurations.

Change-Id: I4e73347c2095935340bfc8c3737c2adf1ef22a9c
2010-03-04 15:20:09 -08:00
Romain Guy
09433bc2a5 Add clean step for Launcher & Launcher2 2010-03-04 12:01:58 -08:00
Dan Egnor
bba8decfa6 Remove a bunch of obsolete/(potentially) renamed .apk's.
I found these kicking around my system/app with old timestamps, and old
packages just cause trouble.  Depending on the build flavor they may or
may not still be there, but it's harmless to clean them.
2010-03-03 19:27:40 -08:00
Ying Wang
a17463fcac Fix proguard_option_file. 2010-03-03 14:32:06 -08:00
Ying Wang
fa9ae7bbbe Decentralizes cleanspecs.
After this change, you should add-clean-step at the end of CleanSpec.mk
in your project, instead of the centralized cleanspecs.mk in build/core.
2010-03-03 13:08:28 -08:00
Ying Wang
f47dc0638a Merge "Turn on Proguard by default for user/userdebug builds." 2010-03-02 09:41:13 -08:00
Jean-Baptiste Queru
518ce5753a De-dupe PRODUCT_COPY_FILES
This allows to explicitly deal with situations where we
want to use PRODUCT_COPY_FILES to manage overrides.

Change-Id: I2f87862e19b973f090099f335e9bdeb0c9f3bfe9
2010-03-01 16:22:10 -08:00
Xavier Ducrohet
a7c0784287 Merge "The builders project is gone. Remove it from main.mk" 2010-03-01 12:46:54 -08:00
Andy McFadden
a5b1e4e1bb Merge "Tweak default x86 target arch variant." 2010-02-26 14:01:06 -08:00