summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* Support to build factory ramdisk image.Ying Wang2011-12-164-0/+58
| | | | | | | | | | | | | | | | | | | | | Bug: 5769921 With this change, to build factory_ramdisk.img, set PRODUCT_FACTORY_RAMDISK_MODULES in your product config. PRODUCT_FACTORY_RAMDISK_MODULES consists of "<module_name>:<install_path>" pairs. <install_path> is relative to the root of the factory ramdisk output. For example: PRODUCT_FACTORY_RAMDISK_MODULES := \ toolbox:bin/toolbox adbd:sbin/adbd adb:bin/adb On the other hand you can use PRODUCT_COPY_FILES to copy prebuilt files to the factory ramdisk. Or you can define modules that are specific for the factory ramdisk (with LOCAL_MODULE_PATH pointing to TARGET_FACTORY_RAMDISK_OUT) and add the module names to PRODUCT_PACKAGES. Change-Id: I80ff72606415cd74fe6f3bc93020a05d84e45b70
* Merge "Print out ignored PRODUCT_COPY_FILES"Ying Wang2011-12-161-1/+2
|\
| * Print out ignored PRODUCT_COPY_FILESYing Wang2011-12-161-1/+2
| | | | | | | | | | | | So that people know their files are not really copied in accident. Change-Id: I8fab920483230a9f349304dcbdb2fb9d60ee0215
* | Stop Building CTS VM TestsBrian Muramatsu2011-12-161-25/+2
|/ | | | | | | | Bug 5728172 The VM tests were used with the old test runner. Change-Id: I7ba819a394bb9643f937240ebd315d7d7820a8bf
* Remove the R/Manifest classes when building the static Java libraryYing Wang2011-12-154-4/+15
| | | | | | | | | | | Bug: 5448433 Instead of deferring the removal to building the app. In that case any R/Manifest classes in any static Java libraries will be deleted, no matter if they are generated from Android resource, or just source R.java/Manifest.java in the source tree by accident. Change-Id: I656f45e3cbc3796c5d4832363231480b3f1dc5b8
* Don't remove R class to fix the build.Ying Wang2011-12-151-1/+1
| | | | | | | | | Unfortunately there is R.java checked in the source tree that gets built into static library. So we have to find a way to delete classes from R.java generated by the build system on the fly. Change-Id: I2d82d28234cecbf6dd5b02b2dd4f7dbd47e3b626
* Merge "Support to build static Java library with Android resource"Ying Wang2011-12-153-0/+76
|\
| * Support to build static Java library with Android resourceYing Wang2011-12-143-0/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5714516 The rationale behind this change: - the library is compiled into a jar file, but its R class is generated making the constant not constant (static, not final static) (aapt option --non-constant-id). Also the jar file does not contain the R class. - this allows the integer value to not be inlined in the compiled class files. Note that this prevents using switch statements. - the main project use this jar file as a normal static library: it will add all the class files except the R.class. - the main project uses the library res folder as a resource folder with lower priority than the main project (basically the main project is an overlay. This is accomplished using aapt's --auto-add-overlay to handle resources only in the main project (which the normal overlay mechanism doesn't allow). - the main project creates R classes in the main project's package but also in the library's package. This is done with aapt's --extra-packages which accept as many packages as needed, separated by a :. - manifest merging is not done yet, so activities/services/permissions/etc... have to be manually declared in the main app. To use a static library with Android resource in your app, 1. Add the library's resource dir to your app as an overlay: LOCAL_RESOURCE_DIR := <app_resource_dir> <static_library_resource_dirs> 2. Set the proper aapt flags: LOCAL_AAPT_FLAGS := <apps_own_flags> --auto-add-overlay \ --extra-packages <lib1_package_name>:<lib2_package_name>:... Change-Id: Ifb4d2300b952ea4aaee74da1bb0c6c72ea0698a3
* | Add several module owners to the whitelistConley Owens2011-12-151-0/+6
| | | | | | | | Change-Id: I9a215b74167efc2a6b3070dc8b616a289669d10f
* | resolved conflicts for merge of 80fa947b to masterBrian Muramatsu2011-12-142-4/+14
|\ \ | | | | | | | | | Change-Id: I0febb15b690932ad342da4b10eb9c0f13d1d1517
| * \ am fea66cee: Merge "Build Support for CTS Native Tests" into ics-mr1Brian Muramatsu2011-12-142-4/+14
| |\ \ | | | | | | | | | | | | | | | | * commit 'fea66cee1cd661b6bf8ead1988cf008fa61b01a7': Build Support for CTS Native Tests
| | * | Build Support for CTS Native TestsBrian Muramatsu2011-12-132-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 4970300 Adds two new variables, CTS_TEST_CASES and CTS_TEST_XMLS, to be read from CtsTestCaseList.mk. The CTS_TEST_CASES variable can be used to copy any sort of file to the repository/testcases CTS directory. The CTS_TEST_XMLS variable can be used to inject test package xmls from any source rather than relying upon the monolithic and mostly serial buildCts.py script. The existing CTS_CORE_CASE_LIST is coded to only support APKs, so it could not be retrofitted to support native tests. However, the two new variables can do even more than CTS_CORE_CASE_LIST due to their generality. In the future, the idea is move away from CTS_CORE_CASE_LIST and also generate XMLs using separate tools rather than just buildCts.py. Change-Id: Ib52722861c37e0f4d511f9041928395bcaba5dea
| * | | Set version numbers for AOSP - do not mergeJean-Baptiste Queru2011-12-122-3/+3
| | | | | | | | | | | | | | | | Change-Id: I7be67f46069ed758e67066e696aa2567983fa374
* | | | x86: Refine the way we configure the x86 build.David 'Digit' Turner2011-12-143-27/+114
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the result of a recent conversation around the x86 ABI and its relationship with how we build platform images. Briefly: - We want to use feature-based macros like ARCH_X86_HAVE_$FEATURE instead of relying on explicit compiler macros like -DUSE_$FEATURE - We want to allow for other x86-based arch variants, e.g. if someone wants to build Android for a CPU that doesn't support the NDK x86 ABI. However, we need to ensure these are not tagged compatible by mistake (see check at the end of TARGET_linux-x86.mk) - There are several flags which use is dubious now that we have a dedicated toolchain to build all the x86 stuff. Comment them as 'to be considered for removal'. We'll do the proper checks later. Change-Id: I7768d7c34d73e274cbf4c09ae831b55280d6bb58
* | | Merge "Allow to build Java module from mere static Java libraries."Ying Wang2011-12-133-5/+7
|\ \ \
| * | | Allow to build Java module from mere static Java libraries.Ying Wang2011-12-123-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | With this change, we can easily turn a static Java library to a shared Java library. Change-Id: I9915992cd19879846511d6272483d7a0a934e7eb
* | | | Merge "Restrict vendor modules to help AOSP product distribution."Ying Wang2011-12-124-0/+60
|\ \ \ \
| * | | | Restrict vendor modules to help AOSP product distribution.Ying Wang2011-12-124-0/+60
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5692177 If you set "PRODUCT_RESTRICT_VENDOR_FILES := true" in a product configuration, this changes restricts that: - No overlays in the vendor tree. - No PRODUCT_COPY_FILES coming from the vendor tree. - Any referenced package with Android.mk in the vendor tree must have LOCAL_MODULE_OWNER set to a value that's compared against a whitelist stored in the core build system. Change-Id: I172b84c7c853e9a04bf9879ea8dec90bd5054230
* | | | am 38158161: am 3343b27c: x86: The default ATOM BSP flags need to be in sync ↵Bruce Beare2011-12-121-1/+18
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | with the NDK ABI * commit '381581613aab988acc6f9d5b459fd4f533d8c2a5': x86: The default ATOM BSP flags need to be in sync with the NDK ABI
| * | am 3343b27c: x86: The default ATOM BSP flags need to be in sync with the NDK ABIBruce Beare2011-12-091-1/+18
| |\ \ | | | | | | | | | | | | | | | | * commit '3343b27c534fb4ea238f2feaa0d9346840ee2f92': x86: The default ATOM BSP flags need to be in sync with the NDK ABI
| | * | x86: The default ATOM BSP flags need to be in sync with the NDK ABIBruce Beare2011-12-091-1/+18
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic741e1795c655ace1e33ae6708219f2708358090 Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
| * | | am e73b24cc: Did I say 4.1? Oh well what I *really* meant was 4.0.3, of course.Dianne Hackborn2011-12-071-1/+1
| |\ \ \ | | | |/ | | |/| | | | | | | | | * commit 'e73b24ccbe728476e5bc77aaf2fd6865276cacc3': Did I say 4.1? Oh well what I *really* meant was 4.0.3, of course.
| | * | Did I say 4.1? Oh well what I *really* meant was 4.0.3, of course.Dianne Hackborn2011-12-071-1/+1
| | | | | | | | | | | | | | | | Change-Id: I61ccc290aec8fa7e2e68cf01bc920a65b8b9e246
* | | | Merge "Enable -Wall/-Werror with LOCAL_RENDERSCRIPT_FLAGS."Stephen Hines2011-12-073-0/+8
|\ \ \ \
| * | | | Enable -Wall/-Werror with LOCAL_RENDERSCRIPT_FLAGS.Stephen Hines2011-12-073-0/+8
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia2a058e6711839d89072c2e96f0c60aa4cedda6b
* | | | | am 0cd997ff: am 8af0efd6: Improve handling of absolute paths in out directoryJean-Baptiste Queru2011-12-061-1/+5
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * commit '0cd997ff31852af80eab4f3d0c2db8d1a1328085': Improve handling of absolute paths in out directory
| * | | | am 8af0efd6: Improve handling of absolute paths in out directoryJean-Baptiste Queru2011-12-061-1/+5
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | * commit '8af0efd6a157e682d88c9a6e030f37bab9860caf': Improve handling of absolute paths in out directory
| | * | | Improve handling of absolute paths in out directoryJean-Baptiste Queru2011-12-061-1/+5
| | | | | | | | | | | | | | | | | | | | Change-Id: If6b320e274fb1cee33808424246ce2c88b9b7ef5
* | | | | am 78b68045: am ffe03c98: Set OUT_DIR based on a common base pathJean-Baptiste Queru2011-12-062-0/+9
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | | * commit '78b680458b3ba53fb2f88a603e371c002eb8944b': Set OUT_DIR based on a common base path
| * | | am ffe03c98: Set OUT_DIR based on a common base pathJean-Baptiste Queru2011-12-062-0/+9
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'ffe03c984b2836a9b4e4ddb5a17ec0dd26ba686c': Set OUT_DIR based on a common base path
| | * | Set OUT_DIR based on a common base pathJean-Baptiste Queru2011-12-062-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2c4ba8b101d4d186ed4b371b9d07b3bcf75bbcc9 Author: Jean-Baptiste Queru<jbq@google.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
| | * | Build fix - include sdk/lint in build.Tor Norbye2011-11-281-0/+1
| | | |
| | * | Restore AOSP-specific pseudo-version-numbers.Jean-Baptiste Queru2011-11-222-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | For great justice. Change-Id: I5a0f722419bff676142ce975a66225f0cd418ff8
* | | | Print more info of the image size stats.Ying Wang2011-12-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5620615 Before this change it only reports the limit if the real size exceeeds or approaches the limit. Change-Id: Ie1737d6ba2dc2d57ad82c487990e109882526d6e
* | | | am f945235a: am 72db32c7: Merge "Google Add-On API Documentation Fixes ↵Marius Renn2011-11-301-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | (5429077)" into ics-mr1 * commit 'f945235a8adc6b163a0e46941791bb305ef37034': Google Add-On API Documentation Fixes (5429077)
| * | | am 72db32c7: Merge "Google Add-On API Documentation Fixes (5429077)" into ↵Marius Renn2011-11-301-2/+2
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | ics-mr1 * commit '72db32c744744ae1ace26830ecce968b6a95e173': Google Add-On API Documentation Fixes (5429077)
| | * | Google Add-On API Documentation Fixes (5429077)Marius Renn2011-11-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We no longer want a reference directory, but rather maps_api and effects_api directories. Change-Id: I72b3a342d0871ec4cf7010be0d2b6486ca83571b
* | | | Move the prebuilt NDKs to their own git project prebuilts/ndk/.Ying Wang2011-11-291-1/+1
| | | | | | | | | | | | | | | | Change-Id: If85986da436d412cff139af1fd8426e420bec121
* | | | Move prebuilt SDKs to their own git project.Ying Wang2011-11-291-1/+1
| | | | | | | | | | | | | | | | Change-Id: Ie6e9614e43bf82b8dd1f8702968be40cfb76b6c5
* | | | Merge "Bypass alias for grep in the tapas command."Jeff Hamilton2011-11-181-1/+1
|\ \ \ \
| * | | | Bypass alias for grep in the tapas command.Jeff Hamilton2011-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I82705535bda927ddc7e9aebb9610d712b68a50d2
* | | | | am ecca008c: am 700b18cc: Merge "Add the support libraries to the platform ↵Svetoslav Ganov2011-11-181-0/+14
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | | | | | documentation (build)." into ics-mr1 * commit 'ecca008c17c0f74a749289e23f8606f1b92930f6': Add the support libraries to the platform documentation (build).
| * | | am 700b18cc: Merge "Add the support libraries to the platform documentation ↵Svetoslav Ganov2011-11-181-0/+14
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | (build)." into ics-mr1 * commit '700b18cc72e75737fa5cf79896c98f12003b7735': Add the support libraries to the platform documentation (build).
| | * | Add the support libraries to the platform documentation (build).Svetoslav Ganov2011-11-171-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added path to the support libraries. bug: 5629339 Change-Id: Id414597046c528617313881ea857134512d1c2ba
* | | | Merge "Workaround for a gcc-4.6 bug on -fstrict-volatile-bitfields."Jing Yu2011-11-181-1/+2
|\ \ \ \
| * | | | Workaround for a gcc-4.6 bug on -fstrict-volatile-bitfields.Jing Yu2011-11-181-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://gcc.gnu.org/ml/gcc-patches/2011-03/msg01477.html http://gcc.gnu.org/ml/gcc-patches/2011-11/msg01390.html -fstrict-volatile-bitfields is set on by default on gcc-4.6 for ARM target. This causes an inline asm() error. While upstream gcc community is working on the patch, we shut off this option temporarily. This patch does not affect gcc-4.4.3 build. Change-Id: Id7016dc5856a516e10f2617232945034728a74ab
* | | | | Merge "SDK: pass $HOST_OUT variable to atree."Raphael2011-11-161-0/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | SDK: pass $HOST_OUT variable to atree.Raphael2011-11-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Required by Change Id623bbef45 in development.git Change-Id: I43229f1e6aaeea176df92a499b9cda3237fb36b9
* | | | | Merge "Dev branch for ICS MR2."Dianne Hackborn2011-11-141-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Dev branch for ICS MR2.Dianne Hackborn2011-11-101-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I53c18f2e84cd0a5c6529da1acc5f2c8d0ad0ef2e
generated by cgit v1.1 at 2025-02-03 11:54:37 +0000