diff options
author | Keun young Park <keunyoung@google.com> | 2012-06-19 18:24:09 -0700 |
---|---|---|
committer | Keun young Park <keunyoung@google.com> | 2012-06-19 18:24:09 -0700 |
commit | cd0ebca4553782ae8ec744a2a5e324fdfa8ebfe4 (patch) | |
tree | 6641c586a121e30e61d8b74f2c8d7409b123be9e | |
parent | ed2e323cab852c6b6e99dbccc7cc713f28a7e71e (diff) | |
download | sample-cd0ebca4553782ae8ec744a2a5e324fdfa8ebfe4.tar.gz |
enable JAVA build if allowed
- previously disabled in PDK build
Change-Id: Ic7c87d839e8feac940e8f1dfa0a5899868df776c
-rw-r--r-- | apps/SampleEmailPolicy/Android.mk | 4 | ||||
-rw-r--r-- | apps/client/Android.mk | 4 | ||||
-rw-r--r-- | apps/upgrade/Android.mk | 4 | ||||
-rw-r--r-- | frameworks/PlatformLibrary/Android.mk | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/apps/SampleEmailPolicy/Android.mk b/apps/SampleEmailPolicy/Android.mk index 9ae9308..9217018 100644 --- a/apps/SampleEmailPolicy/Android.mk +++ b/apps/SampleEmailPolicy/Android.mk @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -ifneq ($(TARGET_BUILD_PDK),true) +ifneq ($(TARGET_BUILD_JAVA_SUPPORT_LEVEL),) # This is the makefile for the Email Policy package contained elsewhere in this sample. # When deploying to an actual device, you must change LOCAL_PACKAGE_NAME to the name desired for @@ -34,4 +34,4 @@ LOCAL_PROGUARD_FLAG_FILES := proguard.flags include $(BUILD_PACKAGE) -endif # !PDK
\ No newline at end of file +endif # JAVA_SUPPORT diff --git a/apps/client/Android.mk b/apps/client/Android.mk index 2318fe3..dfb6357 100644 --- a/apps/client/Android.mk +++ b/apps/client/Android.mk @@ -14,7 +14,7 @@ # limitations under the License. # -ifneq ($(TARGET_BUILD_PDK),true) +ifneq ($(TARGET_BUILD_JAVA_SUPPORT_LEVEL),) # This makefile is an example of writing an application that will link against # a custom shared library included with an Android system. @@ -40,4 +40,4 @@ LOCAL_PROGUARD_ENABLED := disabled include $(BUILD_PACKAGE) -endif # !PDK
\ No newline at end of file +endif # JAVA_SUPPORT diff --git a/apps/upgrade/Android.mk b/apps/upgrade/Android.mk index 4cba7e4..01ec440 100644 --- a/apps/upgrade/Android.mk +++ b/apps/upgrade/Android.mk @@ -14,7 +14,7 @@ # limitations under the License. # -ifneq ($(TARGET_BUILD_PDK),true) +ifneq ($(TARGET_BUILD_JAVA_SUPPORT_LEVEL),) LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) @@ -34,4 +34,4 @@ LOCAL_PROGUARD_ENABLED := disabled include $(BUILD_PACKAGE) -endif # !PDK
\ No newline at end of file +endif # JAVA_SUPPORT diff --git a/frameworks/PlatformLibrary/Android.mk b/frameworks/PlatformLibrary/Android.mk index ef2651d..b40061b 100644 --- a/frameworks/PlatformLibrary/Android.mk +++ b/frameworks/PlatformLibrary/Android.mk @@ -14,7 +14,7 @@ # limitations under the License. # -ifneq ($(TARGET_BUILD_PDK),true) +ifneq ($(TARGET_BUILD_JAVA_SUPPORT_LEVEL),) # This makefile shows how to build your own shared library that can be # shipped on the system of a phone, and included additional examples of @@ -57,4 +57,4 @@ include $(CLEAR_VARS) include $(call all-makefiles-under,$(LOCAL_PATH)) -endif # !PDK
\ No newline at end of file +endif # JAVA_SUPPORT |