diff --git a/core/definitions.mk b/core/definitions.mk
index 5b7c291875..25aa7f1056 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -2844,9 +2844,10 @@ $(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) \
-		                   --dark-greylist=$(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST) \
-		                   --blacklist=$(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST)
+		xargs $(HIDDENAPI) encode \
+		    --light-greylist=$(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST) \
+		    --dark-greylist=$(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST) \
+		    --blacklist=$(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST)
 endef
 
 define hiddenapi-copy-soong-jar
@@ -2859,9 +2860,10 @@ $(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) \
-		                   --dark-greylist=$(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST) \
-		                   --blacklist=$(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST)
+		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}
 	$(MERGE_ZIPS) -D -zipToNotStrip $${PRIVATE_FOLDER}/classes.dex.jar -stripFile "classes*.dex" \
 		$(2) $${PRIVATE_FOLDER}/classes.dex.jar $(1)