aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-05-27Merge masterlinaro-juno-masterAmit Pundir
* aosp/master: (34 commits) 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 Clarify multiarch warnings Split the rules to build the odex file libctest: zap Remove netd_client. It has moved to the internal tree. Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib build Support to extract JNI libs from prebuilt APK The generic_arm64 system image is full. Fix extra/missing : in path setup. Use aarch64-linux-android-4.9 for arm64 build (attempt #4) Allow qemu_device read-write access to various processes Multilib support for odex Increase system image size to 650M for generic_arm64 Default TARGET_CPU_SMP to true. Fix the missing 2nd arch prefix. Use libc++ versions of gtest libs when needed Use libc++ versions of gtest libs when needed ... Conflicts: core/combo/HOST_linux-x86.mk Change-Id: Icf1ec5bee19547ad0c96a7dd221aecebf4ac6ad5 Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
2014-05-23Merge "Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib build"Ying Wang
2014-05-22Merge changes Ibc943b75,Ib4ccf373,I30ff439b,I7bde0130Colin Cross
* 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
2014-05-22set a prebuilt directory name for the 2nd archColin Cross
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
2014-05-22add vendor directories to gdb shared library search pathColin Cross
Change-Id: Ib4ccf3739d6b2f14597605ce06f00e4776f67976
2014-05-22add 2nd arch gcc to the pathColin Cross
Add the 2nd arch gcc to the path so users can manually run gdb, addr2line, objdump, etc. Change-Id: I30ff439bb6548b897d13bfa87151991d5f2948b3
2014-05-22fix paths when 2nd arch gcc is a different versionColin Cross
arm64 is using gcc 4.9, arm is using gcc 4.8. Fix setpaths() to get a separate version for the 2nd arch. Change-Id: I7bde01308fc7718360e7d0fbd46b3ae8c5f55fa7
2014-05-22Merge "Add some more flags to CLANG_CONFIG_UNKNOWN_CFLAGS"Ying Wang
2014-05-22Merge "Split the rules to build the odex file"Ying Wang
2014-05-22Merge "Clarify multiarch warnings"Dmitriy Ivanov
2014-05-21Clarify multiarch warningsDmitriy Ivanov
* Show multiarch related warnings only if my_module_multilib is both Change-Id: If0c467c1d9b953bd3f40949ab4b97d9329ec021f
2014-05-21Split the rules to build the odex fileYing Wang
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
2014-05-21Merge "libctest: zap"Mark Salyzyn
2014-05-21libctest: zapMark Salyzyn
Change-Id: Ia3ff0cad0995af428adf2dbdf10587dae904ec7d
2014-05-21Merge "Remove netd_client. It has moved to the internal tree."Sreeram Ramachandran
2014-05-21Remove netd_client. It has moved to the internal tree.Sreeram Ramachandran
Change-Id: Iffcdb4900373c05086fd1085b861b6520065b7a3
2014-05-20Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib buildYing Wang
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
2014-05-21Merge "Support to extract JNI libs from prebuilt APK"Ying Wang
2014-05-20Support to extract JNI libs from prebuilt APKYing Wang
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
2014-05-20Merge "The generic_arm64 system image is full."Elliott Hughes
2014-05-20The generic_arm64 system image is full.Elliott Hughes
Change-Id: I454c674033525f2f7847d2c91979dff8093c335b
2014-05-20Merge "Fix extra/missing : in path setup."Christopher Ferris
2014-05-20Fix extra/missing : in path setup.Christopher Ferris
Change-Id: I4d95efc781c58af704012922d95841e009bf6286
2014-05-20Merge "Use aarch64-linux-android-4.9 for arm64 build (attempt #4)"Ben Cheng
2014-05-19Use aarch64-linux-android-4.9 for arm64 build (attempt #4)Ben Cheng
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
2014-05-19Merge "Multilib support for odex"Brian Carlstrom
2014-05-19Merge "Allow qemu_device read-write access to various processes"Ji-Hwan Lee
2014-05-19Allow qemu_device read-write access to various processesJi-Hwan Lee
Basically, allow access of qemu_device where gpu_device is allowed, for the case when the emulator runs with OpenGL/ES emulation. Most noticably, surfaceflinger crashes without qemu_device access. Bug: 15052949 Change-Id: Ib891365a6d503309bced64e2512c4d8f29d9a07e
2014-05-18Multilib support for odexYing Wang
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
2014-05-18Merge "Put prebuilt emulator path after host output"Ji-Hwan Lee
2014-05-18Merge "Increase system image size to 650M for generic_arm64"Ji-Hwan Lee
2014-05-18Increase system image size to 650M for generic_arm64Ji-Hwan Lee
Change-Id: I7969ec54dc4225bbe36651c4d9c6a09de1eb89f4
2014-05-17Merge "Real "LOCAL_MULTILIB := both" for prebuilts"Ying Wang
2014-05-17Merge "Default TARGET_CPU_SMP to true."Ying Wang
2014-05-16Default TARGET_CPU_SMP to true.Ying Wang
Change-Id: If8c52c8ed66d52452967d09885dfe1ca9da13688
2014-05-16Merge "Fix the missing 2nd arch prefix."Ying Wang
2014-05-16Fix the missing 2nd arch prefix.Ying Wang
Bug: 13751317 Change-Id: Ie5a323a0a89245576dbc91271d3178574942627d
2014-05-16Merge "Use libc++ versions of gtest libs when needed"Dan Albert
2014-05-16Use libc++ versions of gtest libs when neededDan Albert
Change-Id: Id8752ea946cbaa747dfa4fccf38d680dfeee5b45
2014-05-16Merge "Use libc++ versions of gtest libs when needed"Dan Albert
2014-05-16Merge "Force to build llvm from source in 64-bit host build."Ying Wang
2014-05-16Use libc++ versions of gtest libs when neededDan Albert
Change-Id: I19aa58a83a9da680d441af5f3956a2fbdf18c4e4
2014-05-16Real "LOCAL_MULTILIB := both" for prebuiltsYing Wang
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
2014-05-16Force to build llvm from source in 64-bit host build.Ying Wang
Bug: 13751317 Change-Id: I4a4150bfe21607eb7a2342bbd8120b431427eee5
2014-05-16Merge "make SignApk do zip alignment"Doug Zongker
2014-05-16Merge "Increase system image size to 650M for generic_x86"Ji-Hwan Lee
2014-05-16Merge "Clear *.ini and skin directory on installclean"Ji-Hwan Lee
2014-05-16Merge "x86_common.mk has been replaced by HOST_x86_common.mk"Ying Wang
2014-05-15x86_common.mk has been replaced by HOST_x86_common.mkYing Wang
Change-Id: I19eea82bb35d3f65a2d894c687131a1eafbe2cc9
2014-05-16Merge "Print all 2ND variables."Christopher Ferris
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-04 23:10:38 +0000