commit d1fd823f3349c55ba1d7e3b022a6bbff9f1f2680
author Ying Wang <wangying@android.com> Wed Nov 11 22:05:48 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 11 22:05:48 2015 +0000
tree ca9c094a5b36ade0e40cb2750e0f3ca533855c0a
parent 6af8ef528b97614bbb6cd6733ae5a8bc2fb8fbda
parent 59bdffa76ab106d4fdca29b93ea1d852780e31e0

Merge "Add suffix .so to use directly libart.so"

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index 7896d38..27b559f 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -333,7 +333,7 @@
 
 # Add build properties for ART. These define system properties used by installd
 # to pass flags to dex2oat.
-ADDITIONAL_BUILD_PROPERTIES += persist.sys.dalvik.vm.lib.2=libart
+ADDITIONAL_BUILD_PROPERTIES += persist.sys.dalvik.vm.lib.2=libart.so
 ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.isa.$(TARGET_ARCH).variant=$(DEX2OAT_TARGET_CPU_VARIANT)
 ifneq ($(DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES),)
   ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.isa.$(TARGET_ARCH).features=$(DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES)