Commit graph

2126 commits

Author SHA1 Message Date
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
Marco Nelissen
194e9bd36b Merge "Update warn.py with more warnings" 2010-03-10 16:34:15 -08:00
Ying Wang
1873e44d58 Merge "Don't force localization for package tagged as tests." 2010-03-10 16:20:32 -08:00
Marco Nelissen
8e20196b81 Update warn.py with more warnings
Change-Id: Ic65e6effe2be60d6a6c2a53c6acf356ad9e7ea94
2010-03-10 16:16:02 -08:00
Colin Cross
57b03f7613 Use ARCH_ARM_HAVE_ARMV7A to select qemu kernel for dexpreopt
Change-Id: I440d944e87324038e465415b1b71613b31052f99
2010-03-10 16:07:26 -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
Jean-Baptiste Queru
d231c0648d Add an empty CleanSpec.mk
Change-Id: Idc6adae88917383b19af0a7cfec88526cd6ac176
2010-03-08 18:04:03 -08: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
29c6c01bd6 Add provisioning app in the generic build
Change-Id: Iffdd4d21a3c55e7a73d58289fda31ac8a27a18ac
2010-03-04 17:31:28 -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
Daniel Sandler
b7aa96bf8e Switch to Launcher2 for all builds.
Change-Id: I0a0af777bc290224c72511abfbc8ed60f8ef2174
2010-03-03 12:50:43 -08:00
Marco Nelissen
6323bd93cc Cleanspec for switching from Music2 back to Music 2010-03-02 13:44:32 -08:00
Ying Wang
f47dc0638a Merge "Turn on Proguard by default for user/userdebug builds." 2010-03-02 09:41:13 -08:00
Ficus Kirkpatrick
384ab7acf4 Merge "Make cgrep look for *.c, *.cc, *.cpp, *.h exclusively." 2010-03-01 17:02:01 -08:00
Ficus Kirkpatrick
8889bdf39c Make cgrep look for *.c, *.cc, *.cpp, *.h exclusively.
It was doing '*.c*' which both included .class files and omitted .h files.

Change-Id: Iedaac4f7ee86df86fdc38341c04ca565f34223b4
2010-03-01 16:51:47 -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
Doug Zongker
0622e322b1 am b87e0e1d: (-s ours) Merge commit \'27bb6f5f\' into manualmerge
Merge commit 'b87e0e1d17299dcd1cdbcfbb80d680b5db8a8cd2'

* commit 'b87e0e1d17299dcd1cdbcfbb80d680b5db8a8cd2':
  add signing checker script to releasetools
2010-03-01 14:04:40 -08:00
Xavier Ducrohet
a7c0784287 Merge "The builders project is gone. Remove it from main.mk" 2010-03-01 12:46:54 -08:00
Doug Zongker
b87e0e1d17 Merge commit '27bb6f5f' into manualmerge 2010-03-01 12:36:07 -08:00
Doug Zongker
27bb6f5f23 add signing checker script to releasetools
The check_target_files_signatures determines what key was used to sign
every .apk in a given target_files.  It can compare that signature to
that of another target_files (eg, the previous release for that
device) and flag any problems such as .apks signed with a different
key.

(This is a backport of a change in froyo.  It does not affect device
code, only the scripts that sign images and OTA packages.)
2010-03-01 12:26:17 -08:00
David 'Digit' Turner
842aab4d46 Merge "Temporary fix for ARMv7 -user builds." 2010-03-01 11:35:22 -08:00
Jack Palevich
4ea454994c Add cleanspec for switching from Music to Music2. 2010-03-01 10:49:40 -08:00
Andy McFadden
a5b1e4e1bb Merge "Tweak default x86 target arch variant." 2010-02-26 14:01:06 -08:00
Andy McFadden
ef26218762 Tweak default x86 target arch variant.
Simply set the arch variant for sim-eng to be "x86".
2010-02-26 13:50:44 -08:00
David 'Digit' Turner
171e0d0003 Temporary fix for ARMv7 -user builds.
This switches the emulator to "single step" emulation mode which is
slower but seems to work-around the current ARMv7 emulation bug.

This allows the dexreopt passes to go through normally.
2010-02-25 14:05:05 -08:00
Dianne Hackborn
d0c997e0b6 Framework no longer links with android-common. 2010-02-25 10:44:45 -08:00
Jean-Baptiste Queru
55934c1766 Merge "Allow to explicitly compile the core build configuration" 2010-02-25 10:04:37 -08:00
Jean-Baptiste Queru
75e3264867 Don't build OTA package for aosp_emulator_us
This allows "make dist" to work on that configuration.

A better fix would be to allow each product to specify
whether it's an emulator target or a device target, and
to adapt to that, but that'd be a lot more intrusive.

Change-Id: I47708025204a4991466abceb1708a3020a543238
2010-02-24 15:59:36 -08:00
Xavier Ducrohet
b464b5e82e The builders project is gone. Remove it from main.mk
Change-Id: Ibec7be55667e83d635e1de990772e2730d0e75ff
2010-02-24 13:10:55 -08:00
Joe Onorato
03e2c09378 Merge "Make mmm handle symbolic links." 2010-02-24 11:39:55 -08:00
Andy McFadden
16e95bb99d Build the target side of the simulator as 32-bit.
This detail got lost in my previous cleanup change 9b4a812.

Also add a comment explaining why the host side of the
simulator needs to be built in 64-bit (wxWidgets).

Change-Id: I2a867f7f80b43d53e73348b19f6ae834600295f9
2010-02-24 08:33:08 -08:00
Niko Catania
5217f4db12 Merge "Added cleanup step for the switch to stlport for gtest" 2010-02-23 15:27:54 -08:00
Nicolas Catania
f082dd34f5 Added cleanup step for the switch to stlport for gtest 2010-02-23 15:12:35 -08:00
Jean-Baptiste Queru
9b4a81237b Get rid of $(combo_target)
The only OS-ARCH combo that would have benefited from it
is linux-x86, but it explicitly used separate configurations
for the HOST_ and TARGET_ side of things.

This makes is clear which files are related to the HOST_
configuration and which ones are related to the TARGET_
configuration, and expands $(combo_target) to the only
possible/reasonable value that it could have had in every
file.

This also cleans up the simulator, by moving it in a single
place in TARGET_linux_x86 (since the only part that's special
is to use HOST_ settings even when building TARGET_ modules).

Change-Id: I2420eeb8cfe539f5807ec99cb3177ffb9f2476d5
2010-02-23 12:36:56 -08:00
Andy McFadden
e009f29590 Fix build.
The "set default variant to armv5te if none defined" in the ARM config
was applying to all architectures, but as it turns out only ARM builds
actually cared.  When I made a copy of the "set default" code to the x86
config, one or the other would win for builds that didn't specify a
variant.  Turns out x86 won, so sim and voles worked, but opal didn't.
2010-02-23 10:24:33 -08:00
Jean-Baptiste Queru
c3f42a9ae2 Allow to explicitly compile the core build configuration
Also add some missing copyright notices

Change-Id: I86873ad58f3dadbec8be741982bed548cb7e3c8e
2010-02-23 10:15:24 -08:00
Andy McFadden
b94202f222 Merge "Provide default variant for x86." 2010-02-23 10:00:38 -08:00