Commit graph

14 commits

Author SHA1 Message Date
Colin Cross
70e0ac6bc1 Remove HOST_PREFER_32_BIT
HOST_PREFER_32_BIT was used during the switch to 64-bit host tools to
keep the SDK building as 32-bit, but is never set any more.

Change-Id: I874f89c7d1e9cd8c9d4c879048d81a4362ce4dce
2016-09-02 13:20:52 -07:00
Colin Cross
744d33b381 Add support for LOCAL_MODULE_SYMLINKS
Specifying LOCAL_MODULE_SYMLINKS will create symlinks to the installed
module in the same directory.

Change-Id: Idecb2b75f0c9999eb000eed9a79a989244ccf6c2
2016-07-15 12:22:39 -07:00
Dan Willemsen
1c6dc5b942 Remove USE_NINJA=false
And everything special-cased on that. Add a warning if USE_NINJA is
set to let users know that it no longer changes anything.

Change-Id: Ib8739151fe26ea6bf8f76b7ac2b8f4097dab0b47
2016-02-26 21:48:31 -08:00
Colin Cross
7ee3b85eba resolved conflicts for 953981db to stage-aosp-master
Change-Id: Ic1003a594ac5e5e91b124f249a569fb81123e973
2015-09-28 18:45:23 -07:00
Colin Cross
a4447e8c89 Don't add dependencies on Makefiles when using ninja
Ninja has an implicit dependency on the command being run, and kati will
regenerate the ninja manifest if any read makefile changes, so there is no
need to have dependencies on makefiles.
This won't catch all the cases where LOCAL_ADDITIONAL_DEPENDENCIES contains
a .mk file, because a few users of LOCAL_ADDITIONAL_DEPENDENCIES don't
include base_rules.mk, but it will fix the most common ones.

Bug: 23566977
Change-Id: I66de882421376303ab7233c8ce7274548f6b2199
2015-09-28 16:29:52 -07:00
Ying Wang
e25b3984ff Improved nothing-to-do-build
- Removed unnecessary dependency of
  "$(my_symlink) :  $(LOCAL_INSTALLED_MODULE)"
  We can generate symlink to nonexistent file.
  Actually in multilib build $(LOCAL_INSTALLED_MODULE) points to file
  that may not be the target file of the symlink and leads to always
  obsolete $(my_symlink) in the above dependnecy.
- Touch by-product in the dummy rule, to make sure the by-product is
  newer than the main-product.

Change-Id: I2f0e0cc197c49f920fa1f6794083b21cdc333c20
2015-02-26 18:47:21 -08:00
Nicolas Geoffray
ffefd33491 Revert "Use PRIVATE_POST_INSTALL_CMD to simplify executable_prefer_symlink.mk"
This breaks our build-art-host and build-art-target. I think we need to rewrite those rules as well.

This reverts commit 29f0a487b0.

Change-Id: I2e6674e01a2042e9d53e28ecd3e6bdf76fa806a3
2014-11-25 12:52:26 +00:00
Ying Wang
29f0a487b0 Use PRIVATE_POST_INSTALL_CMD to simplify executable_prefer_symlink.mk
Change-Id: I4a2827b2cdbb0bf5a8ca960561fbe17cc80cc275
2014-11-24 15:44:39 -08:00
Narayan Kamath
123854da97 Fix broken comparison in executable_prefer_symlink.mk
bug: 17024634
Change-Id: Ie9fdcbca1cbd6d204be57636864bb8074cd19732
2014-08-14 15:28:48 +01:00
Brian Carlstrom
191e5988d0 resolved conflicts for merge of da92aef7 to master
Change-Id: I70b608d48b0e7cfea3d970101769c156a211f861
2014-06-28 13:54:24 -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
Narayan Kamath
79bc52af37 Fix issue in symlinking 64 bit executables.
We were not inspecting the value of TARGET_SUPPORTS_{32,64}_BIT_APPS
so we'd sometimes create the wrong symlink if TARGET_IS_64_BIT was
true.

bug: 15661143

Change-Id: I2a6eb3278445fcd14bc9dc9312f41f972ea77971
2014-06-17 17:02:51 +01:00
Narayan Kamath
4fb8122bcb Fix executable symlinks.
32 bit targets will leave TARGET_PREFER_{32,64}_BIT_APPS unset
so adjust accordingly. Also clean up an explanatory comment.

Change-Id: I1f6faa640e4e862631fff49f7c565766ef2c567f
2014-05-14 18:26:48 +01:00
Yongqin Liu
d1d42e88dc executable_prefer_symlink: add makefile for creating symlink to prefer version
For a 64bit target, we can have support for both 32bit and 64bit version
binary(like app_process, dalvikvm), and there are some commands like am/pm
will call these commands to implement it's function.

In some targets it will prefer to use the 32bit version, and in other targets
it will prefer to use the 64bit version. So this change is to add the common
work for creating the symlink to the prefer version binary,and avoid the
change on the caller commands side like am/pm.

In this change, it uses TARGET_PREFER_32_BIT_APPS to decide linking to
32bit version or 64bit version.

Change-Id: I96f041c0e0ededd953feead30ec63ad63e945a6f
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
2014-05-09 14:08:49 +08:00