summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* Allow to build target-files.zip in sdk build.Ying Wang2014-04-142-1/+4
| | | | | | | and put the target-files.zip on the build server. Bug: 13763122 Change-Id: I71ab6aa40666fdb24ec0da0fbfc7b73753d4f0c7
* am 62eb51af: Keep Parcelable CREATOR fieldsScott Kennedy2014-04-071-3/+4
|\ | | | | | | | | * commit '62eb51af23b5f0ac43a8f596582d469fe5e3a375': Keep Parcelable CREATOR fields
| * Keep Parcelable CREATOR fieldsScott Kennedy2014-04-071-3/+4
| | | | | | | | Change-Id: I64451134a9d11d17307ef4d8ea923df5fe5e37ed
* | cortex-a7 supports divBrian Carlstrom2014-03-311-1/+1
| | | | | | | | Change-Id: Id06fe4af3a71bbb8beee4d1846f1917d87664033
* | am cc851243: Merge "Add annotation support lib." into klp-ub-devXavier Ducrohet2014-03-261-0/+1
|\ \ | |/ | | | | | | * commit 'cc85124393c438986e6639bc90906edf2dc2ca7a': Add annotation support lib.
| * Merge "Add annotation support lib." into klp-ub-devXavier Ducrohet2014-03-261-0/+1
| |\
| | * Add annotation support lib.Xavier Ducrohet2014-03-261-0/+1
| | | | | | | | | | | | Change-Id: I5a4ddbdf09a09db944e16ed6baab604aa1710974
* | | am 266cf4f2: am f39752e9: Skip the product-scoped --product flag if it\'s ↵Ying Wang2014-03-251-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | set in LOCAL_AAPT_FLAGS * commit '266cf4f2595323170fe02db05835884b4522a0f9': Skip the product-scoped --product flag if it's set in LOCAL_AAPT_FLAGS
| * | am f39752e9: Skip the product-scoped --product flag if it\'s set in ↵Ying Wang2014-03-241-1/+1
| |\ \ | | |/ | |/| | | | | | | | | | | | | LOCAL_AAPT_FLAGS * commit 'f39752e99b4e5083f1e91c46722f87def8143b49': Skip the product-scoped --product flag if it's set in LOCAL_AAPT_FLAGS
| | * Skip the product-scoped --product flag if it's set in LOCAL_AAPT_FLAGSYing Wang2014-03-201-1/+1
| | | | | | | | | | | | | | | Bug: 11335547 Change-Id: Ic08b7557a288508e8e8d14a725923960c47f5ca0
| * | am 7503e736: 4.4.3 is MR2, version boogaloo!Dianne Hackborn2014-03-111-1/+1
| |\ \ | | |/ | | | | | | | | | * commit '7503e736ebb0161a23ff0ee39a307cd436ea8afc': 4.4.3 is MR2, version boogaloo!
| | * 4.4.3 is MR2, version boogaloo!Dianne Hackborn2014-03-111-1/+1
| | | | | | | | | | | | Change-Id: I1a06850393247183fa3db9fbd3fbc8774f181a26
* | | Add v17/leanback to pathmap.Tim Kilbourn2014-03-181-1/+2
| | | | | | | | | | | | Change-Id: I3032710da8cf8714516bf78f0971223257dfe1ec
* | | Add init.environ.rc to installcleanAdam Hampson2014-03-071-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BOOTCLASSPATH needs to be rebuilt when switching between build targets. Bug: 13282187 Change-Id: I16816abb4246878a60e1aa8c91b6b38c7339950e Signed-off-by: Adam Hampson <ahampson@google.com>
* | | Re-order atree files so PRODUCT_SDK_ATREE_FILES can provide overrides.Griff Hazen2014-02-281-6/+6
| | | | | | | | | | | | Change-Id: Iecea3f3af628d89df65a44293a977b2bce35bf28
* | | Remove the default sdk.atree if custom one is set.Ying Wang2014-02-181-2/+1
| | | | | | | | | | | | Change-Id: I5d20b030db5ef29d7ff6eb64a0a1e11a4283e85d
* | | Make the module existence check nonfatalYing Wang2014-02-141-1/+5
| | | | | | | | | | | | | | | | | | | | | Now we have sdk variants that may inherit the non-existent module names from the device product. Change-Id: Ibe96a33cde650fd79ae4731561dcb674203c3b91
* | | Merge "Support custom sdk.atree files." into klp-modular-devYing Wang2014-02-122-0/+7
|\ \ \
| * | | Support custom sdk.atree files.Ying Wang2014-01-292-0/+7
| | | | | | | | | | | | | | | | | | | | Bug: 12683047 Change-Id: I79ca1eff81e947d03c50759d47426487e48435d0
* | | | am 960d919e: resolved conflicts for merge of 4df82b3e to klp-dev-plus-aospYing Wang2014-02-083-2/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * commit '960d919e814726f05ad1a9b82e6a9677f9977f15': Allow proguarding the main app and the test app in a single run.
| * \ \ \ resolved conflicts for merge of 4df82b3e to klp-dev-plus-aospYing Wang2014-02-083-2/+10
| |\ \ \ \ | | | |/ / | | |/| | | | | | | Change-Id: I7a1d9e1954ede06a818814bd05a77c69f1ed3bc6
| | * | | Allow proguarding the main app and the test app in a single run.Mihail Dumitrescu2014-02-073-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 12895101 Change-Id: I6804d73306a164d3e3ec0cab4743f9582b5ef2cf
* | | | | Set up rules to merge AndroidManifest.xmlsYing Wang2014-02-055-19/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now you can merge the library manifest files to the main app's AndroidManifest.xml with LOCAL_FULL_LIBS_MANIFEST_FILES. LOCAL_FULL_LIBS_MANIFEST_FILES is a list of paths relative to the top of the source tree. Bug: 12907528 Change-Id: I16a347c83dfb6fbbb7d5d40284b7c65aa682fdd2
* | | | | Merge "Allow multiple asset directories in aapt" into klp-modular-devAdam Lesinski2014-02-051-2/+8
|\ \ \ \ \
| * | | | | Allow multiple asset directories in aaptAdam Lesinski2014-02-051-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AAPT already supports this. Change-Id: I293c7543fb43b15eedf2162416da48915ce02db8
* | | | | | Change PLATFORM_VERSION and PLATFORM_VERSION_CODENAME to KKWT.Justin Koh2014-02-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change PLATFORM_VERSION and PLATFORM_VERSION_CODENAME to KKWT, as discussed. Change-Id: Ia2d8628c4e9ee6b3cf654c8bdfc966a4af5c573c
* | | | | | am 190ebe94: Merge "pdk: add android_common.jar" into klp-volantis-devColin Cross2014-01-301-1/+3
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | * commit '190ebe94e1a3c18183fa1940e7599b4d6f70b470': pdk: add android_common.jar
| * | | | | Merge "pdk: add android_common.jar" into klp-volantis-devColin Cross2014-01-301-1/+3
| |\ \ \ \ \
| | * | | | | pdk: add android_common.jarColin Cross2014-01-291-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add android_common.jar to the pdk java libraries to allow partners to build test apps against it. Change-Id: I3f3c0f6ef086489aec293e10b0d707845b174655
* | | | | | | am 833188c1: am e7bd4f5c: am 472a4858: Merge "gtest needs -lpthread."Elliott Hughes2014-01-291-0/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '833188c16ea5d2f12aa0108119c327d6cd31d4ea': gtest needs -lpthread.
| * | | | | | am e7bd4f5c: am 472a4858: Merge "gtest needs -lpthread."Elliott Hughes2014-01-291-0/+2
| |\ \ \ \ \ \ | | |/ / / / / | |/| | / / / | | | |/ / / | | |/| | | * commit 'e7bd4f5cdf5d1ac0c49d42ed41322f10e7f34f9b': gtest needs -lpthread.
| | * | | | am 472a4858: Merge "gtest needs -lpthread."Elliott Hughes2014-01-291-0/+2
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '472a48585ec1cfb66c5716f85b0efdf528b29f5d': gtest needs -lpthread.
| | | * \ \ \ Merge "gtest needs -lpthread."Elliott Hughes2014-01-291-0/+2
| | | |\ \ \ \
| | | | * | | | gtest needs -lpthread.Elliott Hughes2014-01-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Host gtests that don't use pthreads themselves need to be linked against libpthread because gtest itself uses pthreads to ensure thread-safety. (It can't know in advance whether the code under test is going to spin up threads, so it has to be pessimistic.) Change-Id: I14fb1098c163d7fe6ae9a9a0314acead4ec9383d
* | | | | | | | am f7784e46: am 1a0e8501: am 1a731adf: Merge "Fix KERNEL_HEADERS_ARCH for ↵Elliott Hughes2014-01-282-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mips and x86." * commit 'f7784e46170e90cb38ddbab15b7aa3a4a7e2d07d': Fix KERNEL_HEADERS_ARCH for mips and x86.
| * | | | | | | am 1a0e8501: am 1a731adf: Merge "Fix KERNEL_HEADERS_ARCH for mips and x86."Elliott Hughes2014-01-282-2/+2
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '1a0e850141fe19e1f1d503822893b8d66c0bca69': Fix KERNEL_HEADERS_ARCH for mips and x86.
| | * | | | | | am 1a731adf: Merge "Fix KERNEL_HEADERS_ARCH for mips and x86."Elliott Hughes2014-01-282-2/+2
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '1a731adf943bc716cc7b9c95b321db02ad7216db': Fix KERNEL_HEADERS_ARCH for mips and x86.
| | | * | | | | Merge "Fix KERNEL_HEADERS_ARCH for mips and x86."Elliott Hughes2014-01-282-2/+2
| | | |\ \ \ \ \
| | | | * | | | | Fix KERNEL_HEADERS_ARCH for mips and x86.Elliott Hughes2014-01-282-2/+2
| | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | arm and arm64 have distinct headers, but mips and mip64, and x86 and x86_64 use headers that work for both widths. So where arm/arm64 need to handle the second architecture case specially, all we need to do for the others is hard-code the name. (x86_64.mk already hard-codes x86; we need to change x86.mk for the case where we're building the 32-bit binaries for a mixed system. mips64.mk doesn't exist yet, but when it does, it'll hard-code just plain "mips" too.) Change-Id: Ia6b9f77b4eb2c78729b454045875c409e0ea8197
* | | | | | | | am dc5dd9b4: am d3737d07: am 49eb4409: Merge "build: ↵Brian Carlstrom2014-01-283-3/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PRODUCT_DEX_PREOPT_IMAGE_IN_DATA" * commit 'dc5dd9b47fe2a24410b3e70d320655f1b5455966': build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA
| * | | | | | | am d3737d07: am 49eb4409: Merge "build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA"Brian Carlstrom2014-01-283-3/+11
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd3737d07c8adb0848dcddb7df03d1e6b4378ab93': build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA
| | * | | | | | am 49eb4409: Merge "build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA"Brian Carlstrom2014-01-283-3/+11
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '49eb440980db6680ec08c48b416e37e937bf9003': build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA
| | | * | | | | build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATABrian Carlstrom2014-01-283-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry-picked from commit cd337c71ee65b17529a67af34d4c0b2824a4f175) Change-Id: I6d8ab3b3cf52f6a6b15f1c8e8d00cdf59042436b
* | | | | | | | am cb1ad445: am 0d24616d: am cdd14758: Merge "Add support for ↵Colin Cross2014-01-282-0/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TARGET_GLOBAL_UNSUPPORTED_CFLAGS" * commit 'cb1ad445663d190e204330b596b52e4734d9dcf0': Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS
| * | | | | | | am 0d24616d: am cdd14758: Merge "Add support for ↵Colin Cross2014-01-282-0/+4
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TARGET_GLOBAL_UNSUPPORTED_CFLAGS" * commit '0d24616dd1b29e016aaae86761574fd88d701b6d': Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS
| | * | | | | | am cdd14758: Merge "Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS"Colin Cross2014-01-282-0/+4
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cdd1475834156b2e45b73ae86a949efa6c1215eb': Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS
| | | * | | | | Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGSColin Cross2014-01-272-0/+4
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To ease the transition between toolchains, allow a target to specify a list of cflags that the toolchain does not support. These will be filtered out of the cflags provided by the module. Add TARGET_GLOBAL_UNSUPPORTED_CFLAGS := -fstack-protector for the aarch64 toolchain, it does not yet suport -fstack-protector. Change-Id: I168d0c6f131326fad305ec86fad46e6a3e03295a
* | | | | | | am 69c36ee7: am 4fbf23ef: am 0a3cf1a0: Merge "Remove libthread_db from the ↵Elliott Hughes2014-01-286-11/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | default include path." * commit '69c36ee7a8c1e3d8c7ca04d61f75d95585c58253': Remove libthread_db from the default include path.
| * | | | | | am 4fbf23ef: am 0a3cf1a0: Merge "Remove libthread_db from the default ↵Elliott Hughes2014-01-286-11/+0
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | include path." * commit '4fbf23ef8267849ce88217a256b394de3904a4f6': Remove libthread_db from the default include path.
| | * | | | | am 0a3cf1a0: Merge "Remove libthread_db from the default include path."Elliott Hughes2014-01-286-11/+0
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | * commit '0a3cf1a0e5c6dbe132c1dc5e13293960c5e7b103': Remove libthread_db from the default include path.
generated by cgit v1.1 at 2024-12-26 01:44:20 +0000