Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f77936d authored by Ying Wang's avatar Ying Wang
Browse files

Install path support for vendor modules. 

Bug: 5284764
Set "LOCAL_PROPRIETARY_MODULE := true" to install module to vendor
partition.

Change-Id: I1301acc10664a12e313f3b868d9fd6400ac8b133
parent 2b2f3b94

core/base_rules.mk

+9 −5
Original line number Original line Diff line number Diff line
@@ -122,12 +122,16 @@ ifneq (,$(filter $(LOCAL_MODULE),$(CUSTOM_MODULES))) 
  LOCAL_MODULE_TAGS := $(sort $(LOCAL_MODULE_TAGS) user)

  LOCAL_MODULE_TAGS := $(sort $(LOCAL_MODULE_TAGS) user)

endif

endif





# The definition of should-install-to-system will be different depending

# on which goal (e.g., sdk or just droid) is being built.

ifdef LOCAL_IS_HOST_MODULE

ifdef LOCAL_IS_HOST_MODULE

  use_data :=

  partition_tag :=

else

ifeq (true,$(LOCAL_PROPRIETARY_MODULE))

  partition_tag := _VENDOR

else

else

  use_data := $(if $(call should-install-to-system,$(LOCAL_MODULE_TAGS)),,_DATA)

  # The definition of should-install-to-system will be different depending

  # on which goal (e.g., sdk or just droid) is being built.

  partition_tag := $(if $(call should-install-to-system,$(LOCAL_MODULE_TAGS)),,_DATA)

endif

endif

endif





LOCAL_MODULE_CLASS := $(strip $(LOCAL_MODULE_CLASS))

LOCAL_MODULE_CLASS := $(strip $(LOCAL_MODULE_CLASS))
@@ -145,7 +149,7 @@ endif 




LOCAL_MODULE_PATH := $(strip $(LOCAL_MODULE_PATH))

LOCAL_MODULE_PATH := $(strip $(LOCAL_MODULE_PATH))

ifeq ($(LOCAL_MODULE_PATH),)

ifeq ($(LOCAL_MODULE_PATH),)

  LOCAL_MODULE_PATH := $($(my_prefix)OUT$(use_data)_$(LOCAL_MODULE_CLASS))

  LOCAL_MODULE_PATH := $($(my_prefix)OUT$(partition_tag)_$(LOCAL_MODULE_CLASS))

  ifeq ($(strip $(LOCAL_MODULE_PATH)),)

  ifeq ($(strip $(LOCAL_MODULE_PATH)),)

    $(error $(LOCAL_PATH): unhandled LOCAL_MODULE_CLASS "$(LOCAL_MODULE_CLASS)")

    $(error $(LOCAL_PATH): unhandled LOCAL_MODULE_CLASS "$(LOCAL_MODULE_CLASS)")

  endif

  endif

core/clear_vars.mk

+1 −0
Original line number Original line Diff line number Diff line
@@ -112,6 +112,7 @@ LOCAL_DEX_PREOPT:= 
LOCAL_PROTOC_OPTIMIZE_TYPE:= # lite(default),micro,full

LOCAL_PROTOC_OPTIMIZE_TYPE:= # lite(default),micro,full

LOCAL_PROTOC_FLAGS:=

LOCAL_PROTOC_FLAGS:=

LOCAL_NO_CRT:=

LOCAL_NO_CRT:=

LOCAL_PROPRIETARY_MODULE:=





# Trim MAKEFILE_LIST so that $(call my-dir) doesn't need to

# Trim MAKEFILE_LIST so that $(call my-dir) doesn't need to

# iterate over thousands of entries every time.

# iterate over thousands of entries every time.

core/envsetup.mk

+8 −0
Original line number Original line Diff line number Diff line
@@ -206,6 +206,14 @@ TARGET_OUT_DATA_ETC := $(TARGET_OUT_ETC) 
TARGET_OUT_DATA_STATIC_LIBRARIES:= $(TARGET_OUT_STATIC_LIBRARIES)

TARGET_OUT_DATA_STATIC_LIBRARIES:= $(TARGET_OUT_STATIC_LIBRARIES)

TARGET_OUT_DATA_NATIVE_TESTS := $(TARGET_OUT_DATA)/nativetest

TARGET_OUT_DATA_NATIVE_TESTS := $(TARGET_OUT_DATA)/nativetest





TARGET_OUT_VENDOR := $(PRODUCT_OUT)/system/vendor

TARGET_OUT_VENDOR_EXECUTABLES:= $(TARGET_OUT_VENDOR)/bin

TARGET_OUT_VENDOR_OPTIONAL_EXECUTABLES:= $(TARGET_OUT_VENDOR)/xbin

TARGET_OUT_VENDOR_SHARED_LIBRARIES:= $(TARGET_OUT_VENDOR)/lib

TARGET_OUT_VENDOR_JAVA_LIBRARIES:= $(TARGET_OUT_VENDOR)/framework

TARGET_OUT_VENDOR_APPS:= $(TARGET_OUT_VENDOR)/app

TARGET_OUT_VENDOR_ETC := $(TARGET_OUT_VENDOR)/etc



TARGET_OUT_UNSTRIPPED := $(PRODUCT_OUT)/symbols

TARGET_OUT_UNSTRIPPED := $(PRODUCT_OUT)/symbols

TARGET_OUT_EXECUTABLES_UNSTRIPPED := $(TARGET_OUT_UNSTRIPPED)/system/bin

TARGET_OUT_EXECUTABLES_UNSTRIPPED := $(TARGET_OUT_UNSTRIPPED)/system/bin

TARGET_OUT_SHARED_LIBRARIES_UNSTRIPPED := $(TARGET_OUT_UNSTRIPPED)/system/lib

TARGET_OUT_SHARED_LIBRARIES_UNSTRIPPED := $(TARGET_OUT_UNSTRIPPED)/system/lib