summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* am e0df9d95: Merge "Only enable WITH_DEXPREOPT by default for libdvm.so"Brian Carlstrom2014-05-291-4/+6
|\ | | | | | | | | * commit 'e0df9d9577c19975adbf6e5a3489946c8f91ad1e': Only enable WITH_DEXPREOPT by default for libdvm.so
| * Only enable WITH_DEXPREOPT by default for libdvm.soBrian Carlstrom2014-05-291-4/+6
| | | | | | | | | | | | | | | | Bug: 14298175 (cherry picked from commit 9f8e214a919097284a88cb19a1b85ceafc202a67) Change-Id: I96ba4e198b7bc1b7d9a502c432590f41c87d05c4
* | am b3bed595: Merge "Add a dummy build recipe for generated RS cpp files."Ying Wang2014-05-282-2/+4
|\ \ | |/ | | | | | | * commit 'b3bed5952b44e69dc9e1988beb4092303084ef61': Add a dummy build recipe for generated RS cpp files.
| * Merge "Add a dummy build recipe for generated RS cpp files."Ying Wang2014-05-282-2/+4
| |\
| | * Add a dummy build recipe for generated RS cpp files.Ying Wang2014-05-282-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the RS cpp files are generated by the timestamp rule. Though we have the generated RS cpp files depend on the timestamp file, we don't have a build recipe. In such case gmake does some "optimization" that it skip recompiling the generated cpp files, because it assumes the generated cpp files are already up to date even if the rs files have been updated. Bug: 15313144 Change-Id: Ie69ecd2c788057d3619f9c7d2a125d44c4a534a1
* | | am 65afd710: Merge "Add a dummy build recipe for the proto generated header ↵Ying Wang2014-05-281-0/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | files" * commit '65afd710a592390671beb5da15a87b127a5f2125': Add a dummy build recipe for the proto generated header files
| * | Merge "Add a dummy build recipe for the proto generated header files"Ying Wang2014-05-281-0/+2
| |\ \ | | |/
| | * Add a dummy build recipe for the proto generated header filesYing Wang2014-05-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixed issue that gnumake skip updating the cpp file that includes the generated header file when the .proto file gets updated. For example: Say a.cc includes b.pb.h, since b.pb.h is just byproduct of the rule that generates b.pb.cc, and though we have dependency "b.pb.h : b.pb.cc", but we don't have build recipe for that rule. Gmake stupidly thinks that b.pb.h must not be updated in that case so it skips all targets that depends on b.pb.h! With the dumy build recipe, gmake now doesn't skip the depedent targets. Bug: 13009798 Change-Id: I39adc09b7656bdd023f578fb8933667944fd974c
* | | am 7df64f7c: Merge "Move to dalvik.vm.lib.2 to force default to libart"Brian Carlstrom2014-05-281-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit '7df64f7c0d933e3a5f18e0d15402f62b819ef8f0': Move to dalvik.vm.lib.2 to force default to libart
| * | Move to dalvik.vm.lib.2 to force default to libartBrian Carlstrom2014-05-281-1/+1
| |/ | | | | | | | | | | | | | | Bug: 14298175 (cherry picked from commit 7e127ebe0bf8753fcbeeac6140916d512322e308) Change-Id: I0a94e01f46fcc074d8c8fd1e5558fb764ab47361
* | am f4999d3b: Merge "Fix pattern rules for for libdvm."Ying Wang2014-05-282-3/+3
|\ \ | |/ | | | | | | * commit 'f4999d3b8a0d09e790767176c543df1c2ad53c5a': Fix pattern rules for $(installed_odex) for libdvm.
| * Fix pattern rules for $(installed_odex) for libdvm.Ying Wang2014-05-282-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | When the VM is libdvm, we don't put the odex files in an arch specific subdirectory. The previous pattern rules don't work because of the extra "/". With this change, % evaluates to empty string when it's built for libdvm; % evaluates to "<arch_name>/" when it's built for libart. Also removed use of $(create-empty-package), which may causes file name (dummy) conflict with the rule of package.apk. Bug: 15311527 Change-Id: I9f9089bc1896b78c1f47834afdb28a3a51d34480
* | am aae7e3fa: Merge "Support LOCAL_CLANG with arch/bit suffix."Ying Wang2014-05-282-11/+25
|\ \ | |/ | | | | | | * commit 'aae7e3fa66ecf6bf796ba9a107d8f066498ab10b': Support LOCAL_CLANG with arch/bit suffix.
| * Support LOCAL_CLANG with arch/bit suffix.Ying Wang2014-05-272-11/+25
| | | | | | | | | | | | | | Precedence: LOCAL_CLANG_<arch> > LOCAL_CLANG_<32|64> > LOCAL_CLANG. Bug: 15257067 Change-Id: I86b72f3bec162834591287d3b5231b5f40f9a431
* | am 3805f619: Merge "Revert "Fix for duplicate names in whole static libs""Dan Albert2014-05-272-21/+21
|\ \ | |/ | | | | | | * commit '3805f619156163eab8ad92fd51b4a431be1287bd': Revert "Fix for duplicate names in whole static libs"
| * Merge "Revert "Fix for duplicate names in whole static libs""Dan Albert2014-05-272-21/+21
| |\
| | * Revert "Fix for duplicate names in whole static libs"Dan Albert2014-05-272-21/+21
| | | | | | | | | | | | | | | | | | This reverts commit 0e5ce8be34446278a3404ea2a4afc01f20f86c5a. Change-Id: I68b776cb915fd7be8299ddb2899907046dddadf3
* | | am 31101623: Merge "Fix for duplicate names in whole static libs"Dan Albert2014-05-272-21/+21
|\ \ \ | |/ / | | | | | | | | | * commit '31101623b3e621436f6b46f49242ed4642d86164': Fix for duplicate names in whole static libs
| * | Merge "Fix for duplicate names in whole static libs"Dan Albert2014-05-272-21/+21
| |\ \ | | |/
| | * Fix for duplicate names in whole static libsDan Albert2014-05-232-21/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | _extract-and-include-single-(host|target)-whole-static-lib was written such that only the first file of a given name would be extracted and included into the new library. This patch iterates over each identically named archive member, extracts them individually, and adds them to the new archive. Bug: 15110069 Change-Id: Ia08c7be6f40bfc8403908a8808898ada479099b1
* | | am 294301bb: Merge "Exclude libstdc++ and libgcc if libc++ is requested."Ying Wang2014-05-277-26/+34
|\ \ \ | |/ / | | | | | | | | | * commit '294301bb34b62d51305d70780ac031a905fa9efe': Exclude libstdc++ and libgcc if libc++ is requested.
| * | Exclude libstdc++ and libgcc if libc++ is requested.Ying Wang2014-05-237-26/+34
| |/ | | | | | | | | Bug: 15174002 Change-Id: I24fe428c3520f76cd61f0660b59ba18a1f2d2dad
* | am 6cb69bd4: Merge "Add HOST_PREFER_32_BIT to support 32-bit-by-default ↵Ying Wang2014-05-2311-31/+54
|\ \ | |/ | | | | | | | | | | multilib build" * commit '6cb69bd4f20ac3ae3a7d5b5cc323c4480cf8ef75': Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib build
| * Merge "Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib build"Ying Wang2014-05-2311-31/+54
| |\
| | * Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib buildYing Wang2014-05-2011-31/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We already support pure 32-bit and 64-bit-by-default multilib build. With HOST_PREFER_32_BIT we can build 32-bit-by-default multilib build. This will be lest disruptive during the period we transition to 64-bit-by-default. Bug: 13751317 Change-Id: I0d56ce4abbe4afeaacfd70d709f6a349791c0722
* | | am e45c8607: Merge changes Ibc943b75,Ib4ccf373,I30ff439b,I7bde0130Colin Cross2014-05-221-0/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | * commit 'e45c8607b3e2cf7a428a91898aea2752a54389a1': set a prebuilt directory name for the 2nd arch add vendor directories to gdb shared library search path add 2nd arch gcc to the path fix paths when 2nd arch gcc is a different version
| * | Merge changes Ibc943b75,Ib4ccf373,I30ff439b,I7bde0130Colin Cross2014-05-221-0/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: set a prebuilt directory name for the 2nd arch add vendor directories to gdb shared library search path add 2nd arch gcc to the path fix paths when 2nd arch gcc is a different version
| | * | set a prebuilt directory name for the 2nd archColin Cross2014-05-221-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to install 32-bit gdbserver on a 64-bit build, prebuilts/misc/Android.mk needs to know the prebuilt directory name for the 2nd arch. Change-Id: Ibc943b758eb9404f7f5f9fbbd8720cc67f6a6f01
* | | | am b0143e2f: Merge "Add some more flags to CLANG_CONFIG_UNKNOWN_CFLAGS"Ying Wang2014-05-221-0/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'b0143e2fffbd3183175e8c1873d3466598ca9457': Add some more flags to CLANG_CONFIG_UNKNOWN_CFLAGS
| * | | Merge "Add some more flags to CLANG_CONFIG_UNKNOWN_CFLAGS"Ying Wang2014-05-221-0/+5
| |\ \ \
| | * | | Add some more flags to CLANG_CONFIG_UNKNOWN_CFLAGSBernhard Rosenkraenzer2014-05-121-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add some more gcc specific flags that are used somewhere in the tree (e.g. external/chromium_org) to CLANG_CONFIG_UNKNOWN_CFLAGS Change-Id: Icc572fdb6ea4ba818c4d18e430296589eb61bf55 Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
* | | | | am 8a3f514d: Merge "Split the rules to build the odex file"Ying Wang2014-05-224-23/+29
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '8a3f514d44e2c1d4920126b3edd47f7a7616b732': Split the rules to build the odex file
| * | | | Merge "Split the rules to build the odex file"Ying Wang2014-05-224-23/+29
| |\ \ \ \
| | * | | | Split the rules to build the odex fileYing Wang2014-05-214-23/+29
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the odex file is byproduct generated by the package.apk rule. Though we have the odex file depend on the package.apk it doesn't have its own build recipe. In case package.apk isn't updated but we still need to update the odex file (such as changed LOCAL_MULTILIB), the odex file will never be rebuilt. This change split out the rules to build the odex file and make sure the build recipe get executed if the odex file needs rebuild. Change-Id: I60c2f32b536b3d59045301ee863aae1451734aad
* | | | | am 5caca89c: Merge "Clarify multiarch warnings"Dmitriy Ivanov2014-05-221-7/+10
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '5caca89c5d66e9999e26905522bf2eed958d0961': Clarify multiarch warnings
| * | | | Clarify multiarch warningsDmitriy Ivanov2014-05-211-7/+10
| |/ / / | | | | | | | | | | | | | | | | | | | | * Show multiarch related warnings only if my_module_multilib is both Change-Id: If0c467c1d9b953bd3f40949ab4b97d9329ec021f
* | | | am 4e151105: Merge "Support to extract JNI libs from prebuilt APK"Ying Wang2014-05-213-3/+43
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '4e151105a02ba09acb277c6a084252d01c561a5f': Support to extract JNI libs from prebuilt APK
| * | | Support to extract JNI libs from prebuilt APKYing Wang2014-05-203-3/+43
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use LOCAL_PREBUILT_JNI_LIBS to install prebuilt JNI libraries extracted from the prebuilt apk, or prebuilts as source, to the app specific lib path. LOCAL_PREBUILT_JNI_LIBS accepts 2 kinds of files: - Files like @path/to/libfoo.so (path inside the apk) are JNI libs extracted from the prebuilt apk. In this case, all embedded JNI libs inside the prebuilt apk are stripped. - Files like path/to/libfoo.so (path relative to LOCAL_PATH) are prebuilts in the source tree. Those prebuilt JNI libs are not defined as modules in the build system, so this works around possible module name conflict. Bug: 13170859 Change-Id: I91bb844cc11b3621a85733bc7e8910f168957ef0
* | | am 54bea362: Merge "Use aarch64-linux-android-4.9 for arm64 build (attempt #4)"Ben Cheng2014-05-201-6/+5
|\ \ \ | |/ / | | | | | | | | | * commit '54bea362ab7f33791bd6ea54d77a76dc8d9e005d': Use aarch64-linux-android-4.9 for arm64 build (attempt #4)
| * | Merge "Use aarch64-linux-android-4.9 for arm64 build (attempt #4)"Ben Cheng2014-05-201-6/+5
| |\ \
| | * | Use aarch64-linux-android-4.9 for arm64 build (attempt #4)Ben Cheng2014-05-191-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GCC: 4.9 (which supports -fstack-protector) Binutils: 2.24 (which supports gc-sections) GDB: 7.7 NDK libraries are still picked up from prebuilts/ndk/*/4.8/* GCC has been patched to disable codegen for calling __cxa_throw_bad_array_new_length. Source code has been sync'ed against the 2014-05-14 snapshot which contains many important fixes (devirtualization, codegen, ...). Change-Id: I43229360ad0132193d5208cb0d1acba55084853c
* | | | am 64f3a191: Merge "Multilib support for odex"Brian Carlstrom2014-05-199-90/+178
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '64f3a191f92a6ab84a8175ad480633b8c58ac900': Multilib support for odex
| * | | Merge "Multilib support for odex"Brian Carlstrom2014-05-199-90/+178
| |\ \ \ | | |/ / | |/| |
| | * | Multilib support for odexYing Wang2014-05-189-90/+178
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the VM is libart and DEXPREOPT is enabled, - For a Java library and the boot image, we build for both 1st arch and 2nd arch. - For an app, we build for the multilib arch the module is targeted for. The odex file will be in <arch_name>/<module_name>.odex inside the same dir where the jar/apk file gets installed. Nothing changed if it's built for libdvm. Bug: 14694978 Change-Id: I45118a83758b41d52d6c9e38f93f0ba2775a6c74
* | | | am 4636abe5: Merge "Real "LOCAL_MULTILIB := both" for prebuilts"Ying Wang2014-05-174-11/+26
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '4636abe5899272e1e9051e2c98516409107c4e8c': Real "LOCAL_MULTILIB := both" for prebuilts
| * | | Merge "Real "LOCAL_MULTILIB := both" for prebuilts"Ying Wang2014-05-174-11/+26
| |\ \ \
| | * | | Real "LOCAL_MULTILIB := both" for prebuiltsYing Wang2014-05-164-11/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This uses the fact that unsetting LOCAL_MULTILIB equals "either". It's useful to build for both 32-bit and 64-bit in the same prebuilt module definition. Bug: 13751317 Change-Id: I4f1625a83e13f22f807039afebae73f69ed35918
* | | | | am 5ee3f096: Merge "Default TARGET_CPU_SMP to true."Ying Wang2014-05-171-0/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '5ee3f0960dbc6a14333e3b98252d59f5d8d18a7d': Default TARGET_CPU_SMP to true.
| * | | | Default TARGET_CPU_SMP to true.Ying Wang2014-05-161-0/+2
| | |/ / | |/| | | | | | | | | | Change-Id: If8c52c8ed66d52452967d09885dfe1ca9da13688
* | | | am 3c8089ce: Merge "Fix the missing 2nd arch prefix."Ying Wang2014-05-161-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '3c8089cef8eaf90b11852a5c258eba0ff5e3287e': Fix the missing 2nd arch prefix.
generated by cgit v1.1 at 2025-03-23 11:23:34 +0000