diff options
| author | Ying Wang <wangying@google.com> | 2014-07-17 21:24:42 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-07-18 16:26:24 -0700 |
| commit | af9757e84940a3d3f4a4b88d2f1ed259d4f43c02 (patch) | |
| tree | cf56b0c807de53b97b4f718dd838ed96516a121f /core/base_rules.mk | |
| parent | 1756474d873130d3340310782bc397733c80a8b6 (diff) | |
| download | build-af9757e84940a3d3f4a4b88d2f1ed259d4f43c02.zip build-af9757e84940a3d3f4a4b88d2f1ed259d4f43c02.tar.gz build-af9757e84940a3d3f4a4b88d2f1ed259d4f43c02.tar.bz2 | |
New installation path for apks and their JNIs.
Apk's path is changed to <parent_dir>/MyApp/MyApp.apk;
JNI path is changed to <parent_dir>/MyApp/lib/<arch_name>/libfoo.so.
Symlinks of JNIs are changed accordingly.
Bug: 16319961
Change-Id: Ib3b2309c95fa9aea27837fcc29e28d990b04747b
Diffstat (limited to 'core/base_rules.mk')
| -rw-r--r-- | core/base_rules.mk | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/core/base_rules.mk b/core/base_rules.mk index a4f1360..2984d9d 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -179,6 +179,13 @@ LOCAL_BUILT_MODULE := $(built_module_path)/$(my_built_module_stem) built_module_path := ifneq (true,$(LOCAL_UNINSTALLABLE_MODULE)) + # Apk and its attachments reside in its own subdir. + ifeq ($(LOCAL_MODULE_CLASS),APPS) + # framework-res.apk doesn't like the additional layer. + ifneq ($(LOCAL_NO_STANDARD_LIBRARIES),true) + my_module_path := $(my_module_path)/$(LOCAL_MODULE) + endif + endif LOCAL_INSTALLED_MODULE := $(my_module_path)/$(my_installed_module_stem) endif |