lpac-jni: Bail early for Windows builds

This reverts commit 195861f24b.

libs/lpac-jni/src/main/jni/Android.mk

@@ -1,29 +1,18 @@
 LOCAL_PATH := $(call my-dir)
 
-# function to find all *.c files under a directory
-# Detecting the operating system
 ifeq ($(OS),Windows_NT)
-# Windows-specific commands
-define all-c-files-under
-  $(patsubst .\%,%, \
-    $(shell cd $(LOCAL_PATH) & \
-            dir /b/s $(subst /,\,$(1))\*.c) \
-   )
-endef
-else
-# UNIX commands
-define all-c-files-under
-  $(patsubst ./%,%, \
-    $(shell cd $(LOCAL_PATH) ; \
-            find $(1) -name "*.c" -and -not -name ".*" -maxdepth 1) \
-   )
-endef
+$(error "Building on Windows is unsupported")
 endif
 
-include $(CLEAR_VARS)
-LOCAL_SHORT_COMMANDS := true
-APP_SHORT_COMMANDS := true
+# function to find all *.c files under a directory
+define all-c-files-under
+$(patsubst ./%,%, \
+  $(shell cd $(LOCAL_PATH) ; \
+          find $(1) -name "*.c" -and -not -name ".*" -maxdepth 1) \
+ )
+endef
 
+include $(CLEAR_VARS)
 # libcjson
 LOCAL_MODULE := lpac-cjson
 LOCAL_SRC_FILES := \
@@ -31,9 +20,6 @@ LOCAL_SRC_FILES := \
 include $(BUILD_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
-LOCAL_SHORT_COMMANDS := true
-APP_SHORT_COMMANDS := true
-
 # libasn1c, the ASN parser component from lpac
 LOCAL_MODULE := lpac-asn1c
 LOCAL_C_INCLUDES := \
@@ -44,9 +30,6 @@ LOCAL_CFLAGS := -DHAVE_CONFIG_H
 include $(BUILD_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
-LOCAL_SHORT_COMMANDS := true
-APP_SHORT_COMMANDS := true
-
 # libeuicc component from lpac, which contains the actual implementation
 LOCAL_MODULE := lpac-euicc
 LOCAL_STATIC_LIBRARIES := lpac-asn1c lpac-cjson
@@ -57,9 +40,6 @@ LOCAL_SRC_FILES := \
 include $(BUILD_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
-LOCAL_SHORT_COMMANDS := true
-APP_SHORT_COMMANDS := true
-
 LOCAL_MODULE := lpac-jni
 LOCAL_STATIC_LIBRARIES := lpac-euicc
 LOCAL_C_INCLUDES := \