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.
Jean-Baptiste Queru