83815532e0
Merge branch 'master' into froyo-release
2010-03-18 08:07:26 -07:00
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
0aa91dfb6a
FRE76
...
Change-Id: I1104e0b95d3f6fee2c6e9ce6ea180a736c0ab94d
2010-03-17 09:08:38 -07:00
a907befae2
Merge branch 'master' into froyo-release
2010-03-17 09:08:26 -07:00
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
0a8e08b541
FRE75
...
Change-Id: I25a5d5416f37b1cbda6c529afc59430d1856c7bc
2010-03-16 08:13:09 -07:00
deaa16e76f
Merge branch 'master' into froyo-release
2010-03-16 08:12:53 -07:00
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
e3ff47d48e
FRE74
...
Change-Id: I318c6b1f79e889f4f0c522a2654d8af1f4c48737
2010-03-15 10:10:08 -07:00
5eabf72162
FRE70D, but should be ERE71 :-)
...
Change-Id: I3eca568e6d8e547e271a552f89bbd78f35e825e1
2010-03-12 10:41:22 -08:00
ec5ac36069
FRE70C
...
Change-Id: I8377c12fa0e115a86e65623e68754e65d414c074
2010-03-11 18:29:12 -08:00
af0b1dd2de
FRE70B
...
Change-Id: I296572951462f74f0962dd3ccc6c493f0eb95190
2010-03-11 10:03:11 -08:00
e93bf4cc6d
FRE70
...
Change-Id: I69828a69fc21e856ff7d7f7aa7d5a82623bc332c
2010-03-11 08:12:56 -08:00
8df81a3443
Merge branch 'master' into froyo-release
2010-03-11 08:12:43 -08:00
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
1873e44d58
Merge "Don't force localization for package tagged as tests."
2010-03-10 16:20:32 -08:00
f807c55f39
Add a new build target armv7-a-neon
...
Change-Id: Ib3b44e839b093974aff0d595950e6b691beee7a5
2010-03-10 16:07:14 -08:00
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
c61d5932d3
Don't force localization for package tagged as tests.
...
Change-Id: I612598443371fc388cf08ddde7ebdd1d3dec9c7e
2010-03-10 16:02:42 -08:00
08e3883350
Merge "Let Proguard load emma jar if it's enabled."
2010-03-10 13:36:42 -08:00
ed1726d7f6
FRE69
...
Change-Id: I4865703a23a3ec4fe9d38d2707eb1c4680f5bf12
2010-03-10 08:13:02 -08:00
9f86c43e1a
Merge branch 'master' into froyo-release
2010-03-10 08:12:44 -08:00
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
c2577f7e27
FRE68
...
Change-Id: I72c18298dbc6116282bd7df73ae4b90e27b06a76
2010-03-09 08:13:17 -08:00
46dec26211
Merge branch 'master' into froyo-release
2010-03-09 08:12:53 -08:00
4f85d00113
Make ProGuard keep @VisibleForTesting classes and methods
...
Change-Id: I7f5d14fd4188859c52ab85c33af1ac275888611c
2010-03-09 14:37:21 +00:00
d2e571cb55
merge from open-source master
...
Change-Id: I9fedeb014c946b53bfdd424b00c0cb5fc08f8333
2010-03-08 17:16:23 -08:00
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
700b504517
FRE67
...
Change-Id: I34266bae07be0d7ca676b20227a539ef458ebded
2010-03-08 09:16:30 -08:00
9b4fd7213e
Merge branch 'master' into froyo-release
2010-03-08 09:16:08 -08:00
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
221cdbb17d
Fix builds due to Music2 moving around.
2010-03-05 12:45:52 -08:00
11b8202e73
FRE64
2010-03-05 08:19:56 -08:00
f8757f38ad
Merge branch 'master' into froyo-release
2010-03-05 08:19:42 -08:00
048683ea7e
Merge from eclair
...
Change-Id: I4496dadd8a738a05c647589ca78732e9b608ca29
2010-03-05 07:23:14 -08:00
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
09433bc2a5
Add clean step for Launcher & Launcher2
2010-03-04 12:01:58 -08:00
2763048bdf
FRE63C
2010-03-04 09:31:34 -08:00
e94e33dbbe
FRE63B
2010-03-04 09:22:01 -08:00
b82eba47c4
FRE63
2010-03-04 08:58:16 -08:00
389b07f8ed
Merge branch 'master' into froyo-release
2010-03-04 08:58:01 -08:00
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
a17463fcac
Fix proguard_option_file.
2010-03-03 14:32:06 -08:00
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
71fecd1f27
FRE62
2010-03-03 08:11:55 -08:00
8b7721b8ef
Merge branch 'master' into froyo-release
2010-03-03 08:11:41 -08:00
f47dc0638a
Merge "Turn on Proguard by default for user/userdebug builds."
2010-03-02 09:41:13 -08:00
81b8571aef
FRE61
2010-03-02 08:11:22 -08:00
141dfd2003
Merge branch 'master' into froyo-release
2010-03-02 08:11:08 -08:00
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
The Android Automerger