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

Commit 2d56f878 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Allow installing fake vendor packages" into main am: 7683671b am:... 

Merge "Allow installing fake vendor packages" into main am: 7683671b am: f676520f am: a4ce1535 am: f3a31e19

Original change: https://android-review.googlesource.com/c/platform/build/+/2768203



Change-Id: I3d80a291a87c8355a94b8acd6cb02a020f6f406a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 80a88dc8 f3a31e19

core/envsetup.mk

+3 −1
Original line number Diff line number Diff line
@@ -720,6 +720,7 @@ TARGET_OUT_VENDOR_JAVA_LIBRARIES := $(TARGET_OUT_VENDOR)/framework 
TARGET_OUT_VENDOR_APPS := $(target_out_vendor_app_base)/app

TARGET_OUT_VENDOR_APPS_PRIVILEGED := $(target_out_vendor_app_base)/priv-app

TARGET_OUT_VENDOR_ETC := $(TARGET_OUT_VENDOR)/etc

TARGET_OUT_VENDOR_FAKE := $(PRODUCT_OUT)/vendor_fake_packages

.KATI_READONLY := \

  TARGET_OUT_VENDOR_EXECUTABLES \

  TARGET_OUT_VENDOR_OPTIONAL_EXECUTABLES \
@@ -728,7 +729,8 @@ TARGET_OUT_VENDOR_ETC := $(TARGET_OUT_VENDOR)/etc 
  TARGET_OUT_VENDOR_JAVA_LIBRARIES \

  TARGET_OUT_VENDOR_APPS \

  TARGET_OUT_VENDOR_APPS_PRIVILEGED \

  TARGET_OUT_VENDOR_ETC

  TARGET_OUT_VENDOR_ETC \

  TARGET_OUT_VENDOR_FAKE



$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_VENDOR_EXECUTABLES := $(TARGET_OUT_VENDOR_EXECUTABLES)

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_VENDOR_SHARED_LIBRARIES := $(target_out_vendor_shared_libraries_base)/lib