Merge "Adjust arguments of `hiddenapi` tool"
This commit is contained in:
commit
dadcb9ced2
|
@ -2844,7 +2844,8 @@ $(2): $(1) $(HIDDENAPI) $(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST) \
|
|||
find $(dir $(1)) -maxdepth 1 -name "classes*.dex" | sort | \
|
||||
xargs -I{} cp -f {} $(dir $(2))
|
||||
find $(dir $(2)) -name "classes*.dex" | sort | sed 's/^/--dex=/' | \
|
||||
xargs $(HIDDENAPI) --light-greylist=$(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST) \
|
||||
xargs $(HIDDENAPI) encode \
|
||||
--light-greylist=$(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST) \
|
||||
--dark-greylist=$(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST) \
|
||||
--blacklist=$(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST)
|
||||
endef
|
||||
|
@ -2859,7 +2860,8 @@ $(2): $(1) $(HIDDENAPI) $(SOONG_ZIP) $(MERGE_ZIPS) $(INTERNAL_PLATFORM_HIDDENAPI
|
|||
@mkdir -p $${PRIVATE_FOLDER}
|
||||
unzip -q $(2) 'classes*.dex' -d $${PRIVATE_FOLDER}
|
||||
find $${PRIVATE_FOLDER} -name "classes*.dex" | sort | sed 's/^/--dex=/' | \
|
||||
xargs $(HIDDENAPI) --light-greylist=$(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST) \
|
||||
xargs $(HIDDENAPI) encode \
|
||||
--light-greylist=$(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST) \
|
||||
--dark-greylist=$(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST) \
|
||||
--blacklist=$(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST)
|
||||
$(SOONG_ZIP) -o $${PRIVATE_FOLDER}/classes.dex.jar -C $${PRIVATE_FOLDER} -D $${PRIVATE_FOLDER}
|
||||
|
|
Loading…
Reference in New Issue