diff options
| author | Keun young Park <keunyoung@google.com> | 2012-05-31 18:35:42 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-31 18:35:42 -0700 |
| commit | c0da8bc7c62edceafb950c2c56284c3cebc4f0e1 (patch) | |
| tree | dd0805e11983b9b652dc4b732b3ee7a63d6a1927 | |
| parent | efd95e1ac3e317e0e6b4649ce58b4897283ece32 (diff) | |
| parent | 72fa8fd7a822c44c04260d35e19a3de9fccab9df (diff) | |
| download | sample-c0da8bc7c62edceafb950c2c56284c3cebc4f0e1.tar.gz | |
Merge "disable java build for PDK case" into jb-dev
| -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 | 3 |
4 files changed, 15 insertions, 0 deletions
diff --git a/apps/SampleEmailPolicy/Android.mk b/apps/SampleEmailPolicy/Android.mk index b657506..9ae9308 100644 --- a/apps/SampleEmailPolicy/Android.mk +++ b/apps/SampleEmailPolicy/Android.mk @@ -12,6 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +ifneq ($(TARGET_BUILD_PDK),true) + # 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 # your local version, e.g. LOCAL_PACKAGE_NAME := MyDeviceEmailPolicy This will cause the build @@ -31,3 +33,5 @@ LOCAL_CERTIFICATE := platform LOCAL_PROGUARD_FLAG_FILES := proguard.flags include $(BUILD_PACKAGE) + +endif # !PDK
\ No newline at end of file diff --git a/apps/client/Android.mk b/apps/client/Android.mk index 7a38298..2318fe3 100644 --- a/apps/client/Android.mk +++ b/apps/client/Android.mk @@ -14,6 +14,8 @@ # limitations under the License. # +ifneq ($(TARGET_BUILD_PDK),true) + # This makefile is an example of writing an application that will link against # a custom shared library included with an Android system. @@ -37,3 +39,5 @@ LOCAL_JAVA_LIBRARIES := com.example.android.platform_library LOCAL_PROGUARD_ENABLED := disabled include $(BUILD_PACKAGE) + +endif # !PDK
\ No newline at end of file diff --git a/apps/upgrade/Android.mk b/apps/upgrade/Android.mk index cdc65b2..4cba7e4 100644 --- a/apps/upgrade/Android.mk +++ b/apps/upgrade/Android.mk @@ -14,6 +14,8 @@ # limitations under the License. # +ifneq ($(TARGET_BUILD_PDK),true) + LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) @@ -31,3 +33,5 @@ LOCAL_SDK_VERSION := current LOCAL_PROGUARD_ENABLED := disabled include $(BUILD_PACKAGE) + +endif # !PDK
\ No newline at end of file diff --git a/frameworks/PlatformLibrary/Android.mk b/frameworks/PlatformLibrary/Android.mk index d1a694a..ef2651d 100644 --- a/frameworks/PlatformLibrary/Android.mk +++ b/frameworks/PlatformLibrary/Android.mk @@ -14,6 +14,8 @@ # limitations under the License. # +ifneq ($(TARGET_BUILD_PDK),true) + # 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 # including JNI code with the library and writing client applications against it. @@ -55,3 +57,4 @@ include $(CLEAR_VARS) include $(call all-makefiles-under,$(LOCAL_PATH)) +endif # !PDK
\ No newline at end of file |