StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove wildcards of absolute paths" am: dc5ec0bfd8 am: f08f1ad8f9 am: 272c85aa6c am: 178c7607fd

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2584263

Change-Id: I3eb81a8d27e55bbaedc904dbc299cfe7792106c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-05-12 02:10:44 +00:00
committed by Automerger Merge Worker
parent 00c84de792 178c7607fd
commit c1e2642a1a
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/dex_preopt_odex_install.mk
View File

@@ -84,13 +84,14 @@ endif
ifndef LOCAL_DEX_PREOPT_GENERATE_PROFILE ifndef LOCAL_DEX_PREOPT_GENERATE_PROFILE
# If LOCAL_DEX_PREOPT_GENERATE_PROFILE is not defined, default it based on the existence of the # If LOCAL_DEX_PREOPT_GENERATE_PROFILE is not defined, default it based on the existence of the
# profile class listing. TODO: Use product specific directory here. # profile class listing. TODO: Use product specific directory here.
my_classes_directory := $(PRODUCT_DEX_PREOPT_PROFILE_DIR) ifdef PRODUCT_DEX_PREOPT_PROFILE_DIR
LOCAL_DEX_PREOPT_PROFILE := $(my_classes_directory)/$(LOCAL_MODULE).prof LOCAL_DEX_PREOPT_PROFILE := $(PRODUCT_DEX_PREOPT_PROFILE_DIR)/$(LOCAL_MODULE).prof
ifneq (,$(wildcard $(LOCAL_DEX_PREOPT_PROFILE))) ifneq (,$(wildcard $(LOCAL_DEX_PREOPT_PROFILE)))
my_process_profile := true my_process_profile := true
my_profile_is_text_listing := my_profile_is_text_listing :=
endif endif
endif
else else
my_process_profile := $(LOCAL_DEX_PREOPT_GENERATE_PROFILE) my_process_profile := $(LOCAL_DEX_PREOPT_GENERATE_PROFILE)
my_profile_is_text_listing := true my_profile_is_text_listing := true