Merge commit 'f7c634216e673407f5a7a879bcf2ddb2454e4670' into kraken
* commit 'f7c634216e673407f5a7a879bcf2ddb2454e4670':
Replace arm with proper variable for CPU/ABI
Merge commit '6e079d7e3d30cd8985fc5d1e34c871cdf2ec5068' into kraken
* commit '6e079d7e3d30cd8985fc5d1e34c871cdf2ec5068':
Allow for a slightly larger libwebcore, add another library to the list,
Merge commit '03fb96f01eeed12ce5dc6dd8fa2e839ed497758e' into froyo-plus-aosp
* commit '03fb96f01eeed12ce5dc6dd8fa2e839ed497758e':
Allow for a slightly larger libwebcore, add another library to the list,
Merge commit 'aed937ba46e4137ad5a5d047a438f48c4c81e46b' into kraken
* commit 'aed937ba46e4137ad5a5d047a438f48c4c81e46b':
Fixed a bunch of stuff in the prelink mappings file:
Merge commit '3ca0e96a3a66a6c53536bf7346f616e672e2c57a' into froyo-plus-aosp
* commit '3ca0e96a3a66a6c53536bf7346f616e672e2c57a':
Fixed a bunch of stuff in the prelink mappings file:
Add -Wa,--noexecstack and -Wl,-z,noexecstack as default
flags when compiling applications. This enables NX
protections, which prevent code from executing on the
stack or heap. NX protections can block a large number
of buffer overflow attacks, and is an important security
feature.
Change-Id: Iad4bab9f8664584ba6ce832a5318d07680d7a908
* Added mappings for most of the libraries that didn't already
have them (as observed from my build).
* Re-canonicalized all the offsets in the mappings file,
per the official policy of keeping things megabyte-aligned.
* Added comments on each line indicating what size the library
actually appeared to be in my build (to help with future rejiggerings).
* Added a bit of documentation about the whole deal.
Even with this change, I know there are other libraries that will
still need to be included, but I think what I have here is a good
step. Also, this change only reserves room for the new libraries, but
subsequent changes (in other subprojects) are required to actually
start prelinking the new libraries. Those changes will be forthcoming
as well.
Bug: 2651381
Change-Id: I7a06382fc2b8a14bbd3261de58df3f8a31e4108e
Static libraries that include other static libraries were being incorrectly
built with .a files inside the top level .a file, as well as the .o files
that were extracted from the component .a files. This patch fixes the
final ar call to only add .o files to the archive.
Change-Id: Ic1ff025129e3c379fa56b4da2f09e9f16ea3c4fb
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.
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
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
Merge commit '381ee392e8ebba35cb65321415f4cdb537b446ed' into kraken
* commit '381ee392e8ebba35cb65321415f4cdb537b446ed':
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)
Merge commit '966c7355c3705095532bcc71ae6d893bdbe3531d' into kraken
* commit '966c7355c3705095532bcc71ae6d893bdbe3531d':
Add clean step for SDK version change.
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
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
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
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
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.
This allows to explicitly deal with situations where we
want to use PRODUCT_COPY_FILES to manage overrides.
Change-Id: I2f87862e19b973f090099f335e9bdeb0c9f3bfe9
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
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
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
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.
This allows to use a proper $(call inherit-product) across
the open-source -> non-open-source boundary in a way that
can automatically adapt to whether the non-open-source
part is present or not
Change-Id: I357721c68362ff8c0f90610850b0368adee68ada
The variable inheritance system can leave extra spaces in a variable
when multiple levels of inheritance are used. It can expand:
"@inherit:foo @inherit:bar @inherit:baz"
to
"value @inherit:bar @inherit:baz"
and then
"value @inherit:baz" (if bar has no value for the variable)
and then
"value " (if baz also has no value).
Call strip to remove excess spaces between words after each
replacement pass.
Change-Id: Ic4cfc6fed1865066a6353a522e4bdcb68ec875d3
With this change, you can specify "?" in place of a tag number in a
.logtags file and the build system will assign numbers to these tags.
(The numbers used shouldn't matter since we translate them back to tag
names whenever the logs are read back.)
This is pretty straightforward to do:
- make merge-event-log-tags.py assign numbers to any tags that specify
"?"
- make the generated java files depend on the merged output
- make java-event-log-tags.py read both the original .logtags and the
merged output, and fill in tag numbers for any "?" using the merged
version.
Change-Id: Icc6ccd705db461d570fc929922a830aa6deaca48
This change allows modules to insert different include paths before the system
include paths. STLPort uses this to find system include files that have the same
name.
The Dalvik core libraries team would like to start making warnings
errors in certain packages by definition LOCAL_JAVACFLAGS. This will
allow easier debuging of warnings in other packages by supplying
"-Xlint:..." options.
This lets you use the source code from one apk to build a new one
with a new module name, a new android package name and optionally,
a new certificate.
To use this, in a makefile, add this:
$(call inherit-package, \
packages/apps/Music/Android.mk, \
Music, \
MusicFork, \
my_cert, \
com.example.music)
You don't need the LOCAL_PATH and CLEAR_VARS stuff. It will override
only the packages that are defined in the makefile name you give, but
if other modules of other types are defined, you will get an error
saying that it's defined twice. In that case, you need to move the
duplicate library (for example a .so) out into a different makefile.
A LOCAL_OVERRIDES_PACKAGES entry is automatically created for the
forked app.
Three unrelated changes:
- change the add-radio-file makefile function to support adding files
with paths. (The path part of the pathname is stripped off.)
- add an UnmountAll function to the OTA script generation code, so
that we can explicitly unmount everything we've mounted (in addition
to doing it automatically at the end of the script).
- add the updater API version to the info object passed to
device-specific code.
Change-Id: Ia62b15403c1cc8fce8d9910f291450c8077e49f4
Merge commit 'ccd0338ce637e62c483a727de04236aa05f989aa'
* commit 'ccd0338ce637e62c483a727de04236aa05f989aa':
Fix windows make: layoutlib_api moved to sdk.git too.
Merge commit 'e749b5a71abe9c3659921c50cc4468a1a4f984f5' into eclair-plus-aosp
* commit 'e749b5a71abe9c3659921c50cc4468a1a4f984f5':
Fix windows make: layoutlib_api moved to sdk.git too.
Before, LOCAL_RESOURCE_DIR got messed up when the build system
tried to find the whole LOCAL_RESOURCE_DIR string in each
overlay directory.
This change splits LOCAL_RESOURCE_DIR before appending it to
the overlay directory paths.
I've verified that this now works:
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/overlay $(LOCAL_PATH)/res
Change-Id: Iea47f94a14720af0ca4b422aec30acf4acbe13cf
Merge commit 'd1b68863f5ef252a92adcfb22d3ca48872981a61' into eclair-plus-aosp
* commit 'd1b68863f5ef252a92adcfb22d3ca48872981a61':
Add etc1tool to Windows SDK.
Nobody is using it any more, and it'd be too easy to
make a build system change that wouldn't properly handle it.
Change-Id: Ia61232ff944c34c46932c1885b2b0ec1b479566b
Also add a warning when there's TAG=user on a CLASS=apps module,
as this is not what people normally intend (this should be handled
in core.mk instead).
This used to be a source of confusion, with people using TAGS=user on
APPS and non-APPS modules, and being surprised to see some of those
included but not others.
Change-Id: I56b5618a556abdc6b841bf7a943d77c20fe9a4c5
Such tags don't do anything, so using them is at
best a no-op, at worst a typo where the author intended
something else.
Change-Id: I1462032f4df3564b06a82685f226a6d5a665a633
This allows to run droiddoc on only a specific set of subdirectories
instead of using all subdirectories.
Change-Id: I6b5daa31f6ce6801705a5c87bd05ea0e4e8c5d88
commit b03d5f537dee393affddf89663ae6977a5512d98
Author: Andreas Huber <andih@google.com>
Date: Thu Dec 17 14:00:37 2009 -0800
Update cleanspec to facilitate incremental building with full stagefright lib.
commit b92560a1989f8b9cb27a8772cec5346d3d90dc84
Author: Andreas Huber <andih@google.com>
Date: Thu Dec 17 13:31:48 2009 -0800
Enable building stagefright in all builds, make stagefright the default player.
Setting LOCAL_CERTIFICATE to "EXTERNAL" now marks an apk (either a
prebuilt or otherwise) as needing the default test key within the
system, but one that should be signed after the target_files is
produced but before sign_target_files_apks does the rest of the
signing. (We use this to ship apps on the system that are signed by
third parties, like Facebook.)
Merge commit '714111cbdde0fd5c4f276d4666ddb99cbf0c5008' into eclair-mr2-plus-aosp
* commit '714111cbdde0fd5c4f276d4666ddb99cbf0c5008':
include pre-signed prebuilt .apks in apkcerts.txt
Require people who check in new prebuilts to decide what keys they
should be signed with, rather than having a fire drill every time we
go to sign a build and discover new prebuilts.
1. Dedup LOCAL_JAVA_LIBRARIES.
2. Even no resource or asset for a package, we still need to set
package_expected_intermediates_COMMON, which is anyway used by ProGuard.
Merge commit '6c4a70c64d45545814ba60ad8ad3a95474ea0944' into eclair-mr2-plus-aosp
* commit '6c4a70c64d45545814ba60ad8ad3a95474ea0944':
make build depend on event-log-tags file
Merge commit '176c758cb40afd39960eb6b5fe0a3aabbdc4f8cc' into eclair-mr2-plus-aosp
* commit '176c758cb40afd39960eb6b5fe0a3aabbdc4f8cc':
Change version to MR2 development.
Construct the /system/etc/event-log-tags file by unioning together any
*.logtags files included in LOCAL_SRC_FILES throughout the system (with
appropriate error checking for dup tag numbers, etc.)
For java packages, generate a java source file from the logtags file for
that package that contains static integer constants for each tag name.
Merge commit 'aa71af7f8efa812b65461e4d3ca39aae1dd23b8b' into eclair-mr2-plus-aosp
* commit 'aa71af7f8efa812b65461e4d3ca39aae1dd23b8b':
Add Bluetooth to the test list.
Merge commit 'bb0c8804dd7440d589ef8845960ad8b76d4b6617' into eclair-plus-aosp
* commit 'bb0c8804dd7440d589ef8845960ad8b76d4b6617':
Add Bluetooth to the test list.
Merge commit 'bb0c8804dd7440d589ef8845960ad8b76d4b6617' into eclair-mr2
* commit 'bb0c8804dd7440d589ef8845960ad8b76d4b6617':
Add Bluetooth to the test list.
Merge commit 'd867551efea52a7d342b8fd2ed08fc9939090e88' into eclair-mr2-plus-aosp
* commit 'd867551efea52a7d342b8fd2ed08fc9939090e88':
Add the JNI test to the CTS list.
Merge commit 'ffbe862d05cb69278a26fb41950a2ce313451f49' into eclair-mr2
* commit 'ffbe862d05cb69278a26fb41950a2ce313451f49':
Add the JNI test to the CTS list.
Merge commit '07e1232a2dc2887ba0003d629032c21fbb426652' into eclair-mr2-plus-aosp
* commit '07e1232a2dc2887ba0003d629032c21fbb426652':
Update version name to 2.1 and API to 7.
Merge commit 'ffbe862d05cb69278a26fb41950a2ce313451f49' into eclair-plus-aosp
* commit 'ffbe862d05cb69278a26fb41950a2ce313451f49':
Add the JNI test to the CTS list.
Merge commit '90b35770c227f9b4ad56194de627593496acf724' into eclair-plus-aosp
* commit '90b35770c227f9b4ad56194de627593496acf724':
Update version name to 2.1 and API to 7.
Merge commit 'f711e3494ca8e740c19f77ec753051e0517208a3'
* commit 'f711e3494ca8e740c19f77ec753051e0517208a3':
Include the common source files directly in the framework library
Merge commit '89715318b22014e2a2a683fe4300dffc2dd5e512'
* commit '89715318b22014e2a2a683fe4300dffc2dd5e512':
Fix a Windows-only discrepency in the Windows SDK build.
Merge commit '08ab72b3512f59edb45d6156611a72d3a8d04a4e'
* commit '08ab72b3512f59edb45d6156611a72d3a8d04a4e':
Fix the Windows SDK build for the development to sdk split.
Merge commit '1f816cf57b93654638989e6007d669c04b3d9b88' into eclair-mr2-plus-aosp
* commit '1f816cf57b93654638989e6007d669c04b3d9b88':
Include the common source files directly in the framework library
Merge commit 'c3d743d262cd69e817524f8a4e5554ef29ffa837' into eclair-mr2-plus-aosp
* commit 'c3d743d262cd69e817524f8a4e5554ef29ffa837':
Fix a Windows-only discrepency in the Windows SDK build.
Merge commit '6f5cb991f61acbc21090c3744d5bf16b01b7aa52' into eclair-mr2-plus-aosp
* commit '6f5cb991f61acbc21090c3744d5bf16b01b7aa52':
Fix the Windows SDK build for the development to sdk split.
Merge commit '802bb072c2d9efaac1c46ac13d7e69a0aaf936a9' into eclair-mr2-plus-aosp
* commit '802bb072c2d9efaac1c46ac13d7e69a0aaf936a9':
Change where makefile looks for sdk_clean.sh
Merge commit '82a36c3b36a3f80b7c2d6ea382af91cc4e2bca32'
* commit '82a36c3b36a3f80b7c2d6ea382af91cc4e2bca32':
Change name of CTS DeviceInfoCollector package to TestDeviceSetup.
Merge commit '81d88c31be80493886e6844ebf8af8a03273208c' into eclair-plus-aosp
* commit '81d88c31be80493886e6844ebf8af8a03273208c':
Fix a Windows-only discrepency in the Windows SDK build.
Merge commit 'f15e028fe822069e44b0e06fa91f537048538f94' into eclair-plus-aosp
* commit 'f15e028fe822069e44b0e06fa91f537048538f94':
Fix the Windows SDK build for the development to sdk split.
Merge commit '258b2b4504949fa95b733b149dd5f8146bfb7887' into eclair-plus-aosp
* commit '258b2b4504949fa95b733b149dd5f8146bfb7887':
Change where makefile looks for sdk_clean.sh
* changes:
Include the common source files directly in the framework library when building, to allow mutual interdependencies; the common static library will be built independently.
Merge commit '81d88c31be80493886e6844ebf8af8a03273208c' into eclair-mr2
* commit '81d88c31be80493886e6844ebf8af8a03273208c':
Fix a Windows-only discrepency in the Windows SDK build.
Merge commit 'f15e028fe822069e44b0e06fa91f537048538f94' into eclair-mr2
* commit 'f15e028fe822069e44b0e06fa91f537048538f94':
Fix the Windows SDK build for the development to sdk split.
Merge commit '258b2b4504949fa95b733b149dd5f8146bfb7887' into eclair-mr2
* commit '258b2b4504949fa95b733b149dd5f8146bfb7887':
Change where makefile looks for sdk_clean.sh
Merge commit 'd920ec8354940653e6cf53a1540360cca3bcc5f7' into eclair
* commit 'd920ec8354940653e6cf53a1540360cca3bcc5f7':
Fix a Windows-only discrepency in the Windows SDK build.
Merge commit 'a62a442129a28bf3a62139183868a13b91e976ad' into eclair
* commit 'a62a442129a28bf3a62139183868a13b91e976ad':
Fix the Windows SDK build for the development to sdk split.
Merge commit '1ae988040777f88f766fc421af79a61175e917af' into eclair
* commit '1ae988040777f88f766fc421af79a61175e917af':
Change where makefile looks for sdk_clean.sh
Merge commit 'b4805a18e51d3a18caa2cac821479a9535778d58' into eclair-mr2-plus-aosp
* commit 'b4805a18e51d3a18caa2cac821479a9535778d58':
Change name of CTS DeviceInfoCollector package to TestDeviceSetup.
Merge commit '2779fa7d9fea6f61392135a231e69a3e9b89768e' into eclair-plus-aosp
* commit '2779fa7d9fea6f61392135a231e69a3e9b89768e':
Change name of CTS DeviceInfoCollector package to TestDeviceSetup.
Merge commit '2779fa7d9fea6f61392135a231e69a3e9b89768e' into eclair-mr2
* commit '2779fa7d9fea6f61392135a231e69a3e9b89768e':
Change name of CTS DeviceInfoCollector package to TestDeviceSetup.
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
Merge commit '573205f4838cf0369fd6a7028c793726d1eb8620' into eclair-mr2-plus-aosp
* commit '573205f4838cf0369fd6a7028c793726d1eb8620':
Remove external/googleclient (the code moved elsewhere)
Merge commit '34ce59147ca68f81a36ab05533a90199147ef3c7' into eclair-mr2-plus-aosp
* commit '34ce59147ca68f81a36ab05533a90199147ef3c7':
Add the example test to the CTS.
Merge commit 'c3d9645e29aeb124b39a0b7639767a5f1fead229' into eclair-plus-aosp
* commit 'c3d9645e29aeb124b39a0b7639767a5f1fead229':
Add the example test to the CTS.
Merge commit '0774bf3ebd65c22d8cafb18e868bd2bbc1a0c4c9' into eclair-mr2-plus-aosp
* commit '0774bf3ebd65c22d8cafb18e868bd2bbc1a0c4c9':
Enables nodpi drawables in the framework.
Merge commit '580cdbe0fe0dd794c7035d8a406353f88aad827e' into eclair-mr2
* commit '580cdbe0fe0dd794c7035d8a406353f88aad827e':
Enables nodpi drawables in the framework.
Merge commit '580cdbe0fe0dd794c7035d8a406353f88aad827e' into eclair-plus-aosp
* commit '580cdbe0fe0dd794c7035d8a406353f88aad827e':
Enables nodpi drawables in the framework.
