Commit Graph

4142 Commits

Author SHA1 Message Date
Ying Wang 4b1c95d8d2 More consistent use of 64-bit build variable.
Set up TARGET_IS_64_BIT and HOST_IS_64_BIT early so we don't need 2
mechanisms to judge if it's 64-bit build;
Remove the unnecessary 32-bit host variables.

Change-Id: I08d6d4d9ea70f91135fe2ee05463fb9a0d1cee42
2014-07-08 18:04:17 -07:00
Dan Albert 3ffcf184bc Merge "Remove -Bsymbolic from builds." 2014-07-08 18:09:01 +00:00
Ying Wang 979d578ee4 Merge "Fix host java doc by referring to the correct classpath." 2014-07-02 20:59:15 +00:00
Ying Wang ad7809bba4 Fix host java doc by referring to the correct classpath.
In droiddoc for host, we don't generate classes.jar for
LOCAL_JAVA_LIBRARIES. Switch to refer to the installed jar file instead.
This is consistent with how LOCAL_JAVA_LIBRARIES for host is handled in
base_rules.mk.

Bug: 9176318
Change-Id: If7460b30ca5da28743487d66da0029a44108d556
2014-07-07 16:50:39 -07:00
Ying Wang f25318a5f9 Clean the last bit of LOCAL_BUILD_HOST_DEX.
Long live LOCAL_BUILD_HOST_DEX!

Change-Id: I8de23cfc78edc554606a2e1a8a955e8bc3ad02b0
2014-07-07 17:15:38 -07:00
Brian Carlstrom 7b53bca0b9 Merge "Strip all multidex files, not just classes.dex" 2014-07-01 23:33:34 +00:00
Brian Carlstrom fca814550c Strip all multidex files, not just classes.dex
Bug: 10447095
Change-Id: I6053ca97cb0e28621262a385d57c0996e7c1aaab
2014-07-01 23:04:36 -07:00
Dan Willemsen 731322a90d Fix partition_tag usage in install_jni_libs
This was expanding to TARGET_VENDOR_OUT_SHARED_LIBRARIES which was
empty. It should be expanding to TARGET_OUT_VENDOR_SHARED_LIBRARIES.

Change-Id: I32fe22e3e0b91a6d41f6a09a33d3ce2e4061d078
2014-07-01 18:56:31 -07:00
Ying Wang 4b539d1533 Merge "More consistent host library path in multilib build." 2014-06-30 22:29:38 +00:00
Ying Wang 36ef50f2a2 More consistent host library path in multilib build.
In 64-bit multilib host build, changed from
32-bit lib: out/host/<platform>/lib32
64-bit lib: out/host/<platform>/lib
to
32-bit lib: out/host/<platform>/lib
64-bit lib: out/host/<platform>/lib64
.
That way the host library path is consistent with the multilib target
build's. Also with this change prebuilt 32-bit libraries can be reused
in 64-bit host build as 2nd arch binaries. (With previous setup, they
can't be used because they have rpath ../lib in it while the 2nd arch
library path needs ../lib32.

Change-Id: I020199d0c7dd52cdc8dcb7d3a1d22cd6178672e1
2014-06-30 17:06:21 -07:00
Ying Wang efe7779cfb Fix missing rs_compatibility_jni_libs.
Bug: 15935150
Change-Id: I2971bcf4a9fa96e7a5098a759ecc67ba4f565b6c
2014-06-30 11:20:41 -07:00
Ian Rogers cf331d931d Host support for prefer symlink
We need a host symlink for dalvik, our *-dalvik-host build targets
are failing.

Change-Id: I6045de20c948b456a150033deb3459895aff83c6
2014-06-27 17:23:03 -07:00
Elliott Hughes 4b7ba41704 Merge "Add -Wl,--fatal-warnings to x86_64." 2014-06-26 18:33:52 +00:00
Elliott Hughes 3beb51692e Add -Wl,--fatal-warnings to x86_64.
Bug: 11358761
Change-Id: I0c86a2ce3f95e89cc6c6eed65f3595922a90f45f
2014-06-30 14:52:30 -07:00
Igor Viarheichyk c4dfe6ef30 Add --pseudo-localize aapt parameter for builds.
Some packages can override list of locales with
LOCAL_AAPT_INCLUDE_ALL_RESOURCES parameter, disabling
pseudolocalization. Adding new --pseudo-localize flag to
aapt if pseudo-locales are specified in product locales
list solves this issue.

Change-Id: Iae705d4fe99453650339fd1ca65d1005671b3e4f
2014-06-26 17:27:36 -07:00
Ying Wang 6129192ed6 Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build
Bug: 15850610
Change-Id: I46b98adb556d8e6bf166761f8bb240006dbe5b14
2014-06-25 14:25:14 -07:00
Ying Wang 8e20ef6205 Support to add JNI of both archs in multilib build.
Use "LOCAL_MULTILIB := both" to install jni libraries of both archs in
multilib build.
The build system will package jni of both archs to the apk, or install
them to the right location on the system image and create symlinks,
extract .so files from prebuilt apk, etc if appropriate.

Bug: 15849902
Change-Id: I7e147b5a47db476584c38250de7b36c75ea40d81
2014-06-25 09:07:01 -07:00
Ying Wang 7e73eb3f7c Resolve :32 to 32-bit variant only if the variant exists.
Otherwise we just use the original module name.
With this change :32 in 32-bit product configuration will be installed
as expected.

Change-Id: Ibbbf3e8807a17b47f4259c00000a63336bc02f92
2014-06-24 10:22:17 -07:00
Brian Carlstrom 074151bdf3 Switch another reference from core to core-libart
Bug: 14298175
Change-Id: I37dc7d5bc63d967db4b3cb8aee695a40b12a8c8d
2014-06-23 15:34:17 -07:00
Bill Yi 85fe14395b Merge "Restore AOSP-style version numbers - DO NOT MERGE" 2014-06-20 02:09:57 +00:00
Bill Yi b76d4093d3 Restore AOSP-style version numbers - DO NOT MERGE 2014-06-19 00:22:38 -07:00
Brian Carlstrom dab766a731 Merge "Switch from core to core-libart" 2014-06-18 22:48:04 +00:00
Brian Carlstrom b1dafb1804 Switch from core to core-libart
Bug: 14298175
Change-Id: I1db40e7c67322d80a108b2b88e6d2e6d275d7898
2014-06-18 17:42:32 -07:00
Ying Wang 0f1ca830ce Merge "Rewrite the clean steps for TARGET_2ND_ARCH." 2014-06-18 19:25:04 +00:00
Ying Wang f6268b8ed9 Rewrite the clean steps for TARGET_2ND_ARCH.
Convert clean rules from TARGET_ARCH to TARGET_2ND_ARCH and vice versa.

Change-Id: I5711b38cd834272d26d78e5cf847e97f27139c5b
2014-06-18 14:17:13 -07:00
Neil Fuller c61caf11a0 Fix the CTS build now that core is gone
Change-Id: Id36844d17ed7551095fbca4a01e0aaf5224b7ea8
2014-06-19 11:26:54 +01:00
Colin Cross 9d8854e30c Merge "build: delete 64-bit blacklist" 2014-06-17 21:42:00 +00:00
Colin Cross ae2986e51a build: delete 64-bit blacklist
The last projects in the blacklist have been fixed, delete the code.

Change-Id: I0fe7809bd18e32516374c9cb2a6f71df1d3c62ee
2014-06-17 21:35:44 -07:00
Ying Wang 42c9804331 Use the correct MKBOOTIMG.
Change-Id: I7450a85770cc8de2ea313570999a7d7076e950d2
2014-06-18 11:31:21 -07:00
Brian Carlstrom 338d1e7f33 Help catch common 32/64-bit errors.
(cherry picked from commit cf5ea762e015bc044d251814d9062ef1df4dd49f)

Change-Id: I43eb93d41967c63acb0723083c0178019f1364d0
2014-06-17 15:23:49 -07:00
Narayan Kamath d73ec26a19 Merge "Make default 64-bit primary, 32-bit secondary" 2014-06-17 04:39:21 +00:00
Brian Carlstrom d795046319 Make default 64-bit primary, 32-bit secondary
Change-Id: I2613a5072e2778307eebdc95d81f184f748ce9f5
2014-06-16 23:59:43 -07:00
Ying Wang a530bd4025 Merge "Also include the binaries for the 2nd arch." 2014-06-16 15:40:29 +00:00
Ying Wang ec45d37242 Also include the binaries for the 2nd arch.
Also include the binaries for the 2nd arch when building module
packages.

Change-Id: I50d2c7451a77cbccdb365c8efea6c77f5147fde6
2014-06-16 16:42:10 -07:00
Ying Wang 74c9850c79 Explicit record the modules' built-file:installed-file
- This simplifies the logic to get the mapping of built-file to
  installed-file. Previously we used file suffix matching which is error
  prone and not scalable.
- With this change the .odex files will be included automatically.

Bug: 13585955
Change-Id: I4599abf93b9d501bac7aca7758d7f3aee21b3e36
2014-06-16 16:41:48 -07:00
Ying Wang 03270b97ca Put modules with install path to system/ to DATA/ in the zip file.
Change-Id: I3948c28bb3f988d57da41d6eb8f97da4e20b0e86
2014-06-16 16:41:23 -07:00
Ying Wang c17e0f92c5 Merge "Explicit record the modules' built-file:installed-file" 2014-06-16 22:13:20 +00:00
Ying Wang fcb077ea01 Merge "Put modules with install path to system/ to DATA/ in the zip file." 2014-06-16 15:49:03 +00:00
Elliott Hughes bfe62fc30c Remove unused hosts.
Nobody is using freebsd-x86 or linux-ppc.

Change-Id: I4e19fd32d92b39ad574001e7046e37ccd2300a2e
2014-06-16 14:48:59 -07:00
Ying Wang 5181a36bce Trim down BUILD_FINGERPRINT.
Bug: 15593959
Change-Id: I90161045b5d5f2df726a4f69740f0875c8bfc69f
2014-06-13 18:02:44 -07:00
Dan Albert 50031de36e Remove -Bsymbolic from builds.
This is causing issues when tools like asan try to wrap calls like
malloc. See the referenced bug for more details.

Bug: 15432753
Change-Id: I15e8eab5b773afd02dc14c78500cf8246a617718
2014-06-13 10:24:12 -07:00
Elliott Hughes 624220c18a Merge "Remove useless stuff from "AndroidConfig.h"." 2014-06-12 03:32:07 +00:00
Elliott Hughes e82d33d997 Remove useless stuff from "AndroidConfig.h".
The futex wrappers and memcmp16 are no longer available to anyone.
No one was checking for the existence of the SA_NOCLDWAIT constant,
and even if they wanted to, they could just check directly.

Change-Id: If8ac6c2617b76b23a2450f58fc03453f7f82a61f
2014-06-12 15:36:52 -07:00
Ying Wang ff3a904522 Check existence of both 64-bit and 32-bit module variants.
- Do the module name resolving for both host and target modules.
- Check existence of both 64-bit and 32-bit module variants.

Change-Id: I8ada0e734efac6c8dafade8708fff9797b19a78d
2014-06-10 19:23:29 -07:00
Ying Wang b2ba5636f1 Merge "Revert "Don't rename host libraries if only one arch is build."" 2014-06-10 22:08:45 +00:00
Ying Wang 532f1127af Revert "Don't rename host libraries if only one arch is build."
This reverts commit b1f7fb7a50.

Change-Id: Id7ea4803ab52659c1316ea9f1babf8117b667441
2014-06-11 01:12:18 +00:00
Ying Wang b1f7fb7a50 Don't rename host libraries if only one arch is build.
This makes it simpler to reference normal host modules by just their
original names even if they are built for the 2nd arch.

Change-Id: I49d32dad0dc523c458d5f9176993037d8695e6a5
2014-06-10 17:18:08 -07:00
Ying Wang ad10cc76b6 Allow to opt out both multilib in native test.
This fixes error no 64-bit libdvm for dalvik-vm-unit-tests.

Change-Id: Ieb21b3b636facbff32c62bca8bba1df6d21377c6
2014-06-10 17:52:20 -07:00
Ying Wang 6e85f8b0de Set default LOCAL_MULTILIB only if LOCAL_MODULE_HOST_ARCH isn't restricted
Otherwise we may end up conflict between LOCAL_MODULE_HOST_ARCH and the
default multilib mode.
Also removed the unneeded variants of LOCAL_MODULE_HOST_ARCH.

Change-Id: I9e5a0144da3cb6310be0ddf098738987e51305de
2014-06-10 16:24:31 -07:00
Ying Wang e1b867dde7 Fix loophole in module expansion.
Previously we only expanded product_MODULES with LOCAL_REQUIRED_MODULES,
but not modules introduced by LOCAL_SHARED_LIBRARIES; Later we did a further
shared libary expansion in vendor_module_check.mk.
It couldn't track C in the following case:
A : B, by LOCAL_SHARED_LIBRARIES; B : C, by LOCAL_REQUIRED_MODULES.

With this change, we transformed the LOCAL_SHARED_LIBRARIES dependencies
into LOCAL_REQUIRED_MODULES dependencies before doing the required
module expansion and the loophole is closed.
All module names are now expanded to product_MODULES now and it makes
vendor_module_check.mk simpler.

Change-Id: I8835a478d2ce0ce10601a8449f446f07b01c2b7f
2014-06-10 14:30:30 -07:00