瀏覽代碼

nuke asn1c in Android.bp and Android.mk

Peter Cai 1 年之前
父節點
當前提交
6d200d14ac
共有 2 個文件被更改,包括 1 次插入23 次删除
  1. 0 12
      libs/lpac-jni/src/main/jni/Android.bp
  2. 1 11
      libs/lpac-jni/src/main/jni/Android.mk

+ 0 - 12
libs/lpac-jni/src/main/jni/Android.bp

@@ -13,16 +13,6 @@ cc_library_static {
     ],
 }
 
-cc_library_static {
-    name: "liblpac-asn1c",
-    defaults: ["lpac-jni-defaults"],
-    local_include_dirs: ["lpac/euicc/asn1c"],
-    cflags: ["-DHAVE_CONFIG_H"],
-    srcs: [
-        "lpac/euicc/asn1c/asn1/*.c",
-    ],
-}
-
 cc_library_static {
     name: "liblpac-euicc",
     defaults: ["lpac-jni-defaults"],
@@ -30,7 +20,6 @@ cc_library_static {
         "lpac/euicc/*.c",
     ],
     static_libs: [
-        "liblpac-asn1c",
         "liblpac-cjson",
     ],
 }
@@ -44,7 +33,6 @@ cc_library_shared {
     ],
     static_libs: [
         "liblpac-euicc",
-        "liblpac-asn1c",
         "liblpac-cjson",
     ],
     shared_libs: ["liblog"],

+ 1 - 11
libs/lpac-jni/src/main/jni/Android.mk

@@ -14,20 +14,10 @@ LOCAL_SRC_FILES := \
 	$(call all-c-files-under, lpac/cjson)
 include $(BUILD_STATIC_LIBRARY)
 
-include $(CLEAR_VARS)
-# libasn1c, the ASN parser component from lpac
-LOCAL_MODULE := lpac-asn1c
-LOCAL_C_INCLUDES := \
-	$(LOCAL_PATH)/lpac/euicc/asn1c
-LOCAL_SRC_FILES := \
-	$(call all-c-files-under, lpac/euicc/asn1c/asn1)
-LOCAL_CFLAGS := -DHAVE_CONFIG_H
-include $(BUILD_STATIC_LIBRARY)
-
 include $(CLEAR_VARS)
 # libeuicc component from lpac, which contains the actual implementation
 LOCAL_MODULE := lpac-euicc
-LOCAL_STATIC_LIBRARIES := lpac-asn1c lpac-cjson
+LOCAL_STATIC_LIBRARIES := lpac-cjson
 LOCAL_C_INCLUDES := \
 	$(LOCAL_PATH)/lpac
 LOCAL_SRC_FILES := \