Convert external/brotli to Android.bp
See build/soong/README.md for more information.
Test: mmma external/brotli
Change-Id: I224bcb29780dade2c048c59f77cf74b9036dd088
diff --git a/Android.bp b/Android.bp
index 531a784..3c4a4f8 100755
--- a/Android.bp
+++ b/Android.bp
@@ -1,3 +1,18 @@
+// Copyright (C) 2017 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
cc_library {
name: "libbrotli",
host_supported: true,
@@ -31,3 +46,15 @@
},
shared_libs: ["libbrotli"],
}
+
+//
+// Support for brotli in java code.
+//
+
+java_library {
+ name: "brotli-java",
+ host_supported: true,
+ hostdex: true,
+ srcs: ["java/**/*.java"],
+ exclude_srcs: ["java/**/*Test.java"],
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index b3b4d2a..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright (C) 2017 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-#
-# Support for brotli in java code.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-brotli_src_files := $(filter-out %Test.java,$(call all-java-files-under, java/))
-
-# Target build
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(brotli_src_files)
-LOCAL_MODULE := brotli-java
-include $(BUILD_JAVA_LIBRARY)
-
-# Host-side Java build
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(brotli_src_files)
-LOCAL_MODULE := brotli-java
-include $(BUILD_HOST_JAVA_LIBRARY)
-
-# Host-side Dalvik build
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(brotli_src_files)
-LOCAL_MODULE := brotli-java-hostdex
-include $(BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY)