diff options
| -rw-r--r-- | camera/tests/CameraServiceTest/Android.mk | 1 | ||||
| -rw-r--r-- | opengl/libagl/fixed_asm.S | 2 | ||||
| -rw-r--r-- | opengl/libagl/iterators.S | 1 | ||||
| -rw-r--r-- | opengl/tests/fillrate/Android.mk | 1 | ||||
| -rw-r--r-- | opengl/tests/finish/Android.mk | 1 | ||||
| -rw-r--r-- | opengl/tests/swapinterval/Android.mk | 1 | ||||
| -rw-r--r-- | vpn/java/android/net/vpn/VpnManager.java | 14 |
7 files changed, 19 insertions, 2 deletions
diff --git a/camera/tests/CameraServiceTest/Android.mk b/camera/tests/CameraServiceTest/Android.mk index c2a02bb2f2..8da7c1fc0f 100644 --- a/camera/tests/CameraServiceTest/Android.mk +++ b/camera/tests/CameraServiceTest/Android.mk @@ -14,6 +14,7 @@ LOCAL_C_INCLUDES += \ LOCAL_CFLAGS := LOCAL_SHARED_LIBRARIES += \ + libbinder \ libcutils \ libutils \ libui diff --git a/opengl/libagl/fixed_asm.S b/opengl/libagl/fixed_asm.S index 6cbc56fa88..05044f2cd0 100644 --- a/opengl/libagl/fixed_asm.S +++ b/opengl/libagl/fixed_asm.S @@ -20,7 +20,9 @@ .align .global gglFloatToFixed + .type gglFloatToFixed, %function .global gglFloatToFixedFast + .type gglFloatToFixedFast, %function /* diff --git a/opengl/libagl/iterators.S b/opengl/libagl/iterators.S index daf2937ba0..8c8648212f 100644 --- a/opengl/libagl/iterators.S +++ b/opengl/libagl/iterators.S @@ -21,6 +21,7 @@ .arm .global iterators0032 + .type iterators0032, %function /* * iterators0032 diff --git a/opengl/tests/fillrate/Android.mk b/opengl/tests/fillrate/Android.mk index a7d30c25f0..191c59b5ab 100644 --- a/opengl/tests/fillrate/Android.mk +++ b/opengl/tests/fillrate/Android.mk @@ -6,6 +6,7 @@ LOCAL_SRC_FILES:= \ LOCAL_SHARED_LIBRARIES := \ libcutils \ + libutils \ libEGL \ libGLESv1_CM \ libui diff --git a/opengl/tests/finish/Android.mk b/opengl/tests/finish/Android.mk index 56208147da..aa607c6a27 100644 --- a/opengl/tests/finish/Android.mk +++ b/opengl/tests/finish/Android.mk @@ -6,6 +6,7 @@ LOCAL_SRC_FILES:= \ LOCAL_SHARED_LIBRARIES := \ libcutils \ + libutils \ libEGL \ libGLESv1_CM \ libui diff --git a/opengl/tests/swapinterval/Android.mk b/opengl/tests/swapinterval/Android.mk index 619447ca64..9a4145eb48 100644 --- a/opengl/tests/swapinterval/Android.mk +++ b/opengl/tests/swapinterval/Android.mk @@ -6,6 +6,7 @@ LOCAL_SRC_FILES:= \ LOCAL_SHARED_LIBRARIES := \ libcutils \ + libutils \ libEGL \ libGLESv1_CM \ libui diff --git a/vpn/java/android/net/vpn/VpnManager.java b/vpn/java/android/net/vpn/VpnManager.java index 6df612e6b8..ce40b5d0c1 100644 --- a/vpn/java/android/net/vpn/VpnManager.java +++ b/vpn/java/android/net/vpn/VpnManager.java @@ -16,11 +16,15 @@ package android.net.vpn; +import java.io.File; + import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.content.ServiceConnection; +import android.os.Environment; +import android.os.SystemProperties; import android.util.Log; /** @@ -65,7 +69,7 @@ public class VpnManager { /** Error code to indicate a successful connection. */ public static final int VPN_ERROR_NO_ERROR = 0; - public static final String PROFILES_PATH = "/data/misc/vpn/profiles"; + public static final String PROFILES_PATH = "/misc/vpn/profiles"; private static final String PACKAGE_PREFIX = VpnManager.class.getPackage().getName() + "."; @@ -77,7 +81,13 @@ public class VpnManager { private static final String ACTION_VPN_SETTINGS = PACKAGE_PREFIX + "SETTINGS"; - private static final String TAG = VpnManager.class.getSimpleName(); + public static final String TAG = VpnManager.class.getSimpleName(); + + // TODO(oam): Test VPN when EFS is enabled (will do later)... + public static String getProfilePath() { + // This call will return the correct path if Encrypted FS is enabled or not. + return Environment.getSecureDataDirectory().getPath() + PROFILES_PATH; + } /** * Returns all supported VPN types. |