diff options
author | Colin Cross <ccross@android.com> | 2017-10-19 15:06:43 -0700 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2017-10-19 15:06:43 -0700 |
commit | ea8fc511c38d47d9538688fdfcf2e7a8e9f32964 (patch) | |
tree | b778395f770b2b03585a486168c481710a8dbd34 | |
parent | 157721cd6c892f9238eac1acfabaf4f4d4a1e4e6 (diff) | |
download | okhttp-ea8fc511c38d47d9538688fdfcf2e7a8e9f32964.tar.gz |
Convert external/okhttp to Android.bp
See build/soong/README.md for more information.
Test: m checkbuild
Change-Id: I753b29240e5ba525b7e05bd7b52631ea971b9a1a
-rw-r--r-- | Android.bp | 84 | ||||
-rw-r--r-- | Android.mk | 100 |
2 files changed, 84 insertions, 100 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..6f40ce6 --- /dev/null +++ b/Android.bp @@ -0,0 +1,84 @@ +// +// Copyright (C) 2012 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. +// + +// non-jarjar'd version of okhttp to compile the tests against +java_library_static { + name: "okhttp-nojarjar", + hostdex: true, + + srcs: [ + "okhttp/src/main/java/**/*.java", + "okhttp-urlconnection/src/main/java/**/*.java", + "okhttp-android-support/src/main/java/**/*.java", + "okio/okio/src/main/java/**/*.java", + ], + + target: { + android: { + srcs: ["android/main/java/**/*.java"], + exclude_srcs: ["okhttp/src/main/java/com/squareup/okhttp/internal/Platform.java"], + }, + }, + + no_framework_libs: true, + java_version: "1.7", +} + +java_library { + name: "okhttp", + hostdex: true, + jarjar_rules: "jarjar-rules.txt", + static_libs: ["okhttp-nojarjar"], + no_framework_libs: true, + java_version: "1.7", +} + +// A guaranteed unstripped version of okhttp. +// The build system may or may not strip the okhttp jar, but this one will +// not be stripped. See b/24535627. +java_library { + name: "okhttp-testdex", + static_libs: ["okhttp"], + no_framework_libs: true, + java_version: "1.7", +} + +java_library_static { + name: "okhttp-tests-nojarjar", + + srcs: [ + "android/test/java/**/*.java", + "okhttp-android-support/src/test/java/**/*.java", + "okhttp-testing-support/src/main/java/**/*.java", + "okhttp-tests/src/test/java/**/*.java", + "okhttp-urlconnection/src/test/java/**/*.java", + "okhttp-ws/src/main/java/**/*.java", + "okhttp-ws-tests/src/test/java/**/*.java", + "okio/okio/src/test/java/**/*.java", + "mockwebserver/src/main/java/**/*.java", + "mockwebserver/src/test/java/**/*.java", + ], + // Exclude test Android currently has problems with due to @Parameterized (requires JUnit 4.11). + exclude_srcs: ["okhttp-tests/src/test/java/com/squareup/okhttp/WebPlatformUrlTest.java"], + libs: [ + "okhttp-nojarjar", + "junit", + "bouncycastle-nojarjar", + "conscrypt", + ], + no_framework_libs: true, + java_version: "1.7", +} diff --git a/Android.mk b/Android.mk deleted file mode 100644 index cea6eb5..0000000 --- a/Android.mk +++ /dev/null @@ -1,100 +0,0 @@ -# -# Copyright (C) 2012 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. -# -LOCAL_PATH := $(call my-dir) - -okhttp_common_src_files := $(call all-java-files-under,okhttp/src/main/java) -okhttp_common_src_files += $(call all-java-files-under,okhttp-urlconnection/src/main/java) -okhttp_common_src_files += $(call all-java-files-under,okhttp-android-support/src/main/java) -okhttp_common_src_files += $(call all-java-files-under,okio/okio/src/main/java) - -okhttp_system_src_files := $(filter-out %/Platform.java, $(okhttp_common_src_files)) -okhttp_system_src_files += $(call all-java-files-under, android/main/java) - -okhttp_test_src_files := $(call all-java-files-under,android/test/java) -okhttp_test_src_files += $(call all-java-files-under,okhttp-android-support/src/test/java) -okhttp_test_src_files += $(call all-java-files-under,okhttp-testing-support/src/main/java) -okhttp_test_src_files += $(call all-java-files-under,okhttp-tests/src/test/java) -okhttp_test_src_files += $(call all-java-files-under,okhttp-urlconnection/src/test/java) -okhttp_test_src_files += $(call all-java-files-under,okhttp-ws/src/main/java) -okhttp_test_src_files += $(call all-java-files-under,okhttp-ws-tests/src/test/java) -okhttp_test_src_files += $(call all-java-files-under,okio/okio/src/test/java) -okhttp_test_src_files += $(call all-java-files-under,mockwebserver/src/main/java) -okhttp_test_src_files += $(call all-java-files-under,mockwebserver/src/test/java) - -# Exclude test Android currently has problems with due to @Parameterized (requires JUnit 4.11). -okhttp_test_src_excludes := \ - okhttp-tests/src/test/java/com/squareup/okhttp/WebPlatformUrlTest.java - -okhttp_test_src_files := \ - $(filter-out $(okhttp_test_src_excludes), $(okhttp_test_src_files)) - -include $(CLEAR_VARS) -LOCAL_MODULE := okhttp -LOCAL_MODULE_TAGS := optional -LOCAL_SRC_FILES := $(okhttp_system_src_files) -LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt -LOCAL_JAVA_LIBRARIES := core-oj core-libart -LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk -LOCAL_JAVA_LANGUAGE_VERSION := 1.7 -include $(BUILD_JAVA_LIBRARY) - -# A guaranteed unstripped version of okhttp. -# The build system may or may not strip the okhttp jar, but this one will -# not be stripped. See b/24535627. -include $(CLEAR_VARS) -LOCAL_MODULE := okhttp-testdex -LOCAL_MODULE_TAGS := optional -LOCAL_SRC_FILES := $(okhttp_system_src_files) -LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt -LOCAL_JAVA_LIBRARIES := core-oj core-libart -LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk -LOCAL_JAVA_LANGUAGE_VERSION := 1.7 -include $(BUILD_JAVA_LIBRARY) - -# non-jarjar'd version of okhttp to compile the tests against -include $(CLEAR_VARS) -LOCAL_MODULE := okhttp-nojarjar -LOCAL_MODULE_TAGS := optional -LOCAL_SRC_FILES := $(okhttp_system_src_files) -LOCAL_JAVA_LIBRARIES := core-oj core-libart -LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk -LOCAL_JAVA_LANGUAGE_VERSION := 1.7 -include $(BUILD_STATIC_JAVA_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_MODULE := okhttp-tests-nojarjar -LOCAL_MODULE_TAGS := optional -LOCAL_SRC_FILES := $(okhttp_test_src_files) -LOCAL_JAVA_LIBRARIES := core-oj core-libart okhttp-nojarjar junit bouncycastle-nojarjar conscrypt -LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk -LOCAL_JAVA_LANGUAGE_VERSION := 1.7 -include $(BUILD_STATIC_JAVA_LIBRARY) - -ifeq ($(HOST_OS),linux) -include $(CLEAR_VARS) -LOCAL_MODULE := okhttp-hostdex -LOCAL_MODULE_TAGS := optional -LOCAL_SRC_FILES := $(okhttp_system_src_files) -LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt -LOCAL_JAVA_LIBRARIES := conscrypt-hostdex -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk -LOCAL_JAVA_LANGUAGE_VERSION := 1.7 -include $(BUILD_HOST_DALVIK_JAVA_LIBRARY) -endif # ($(HOST_OS),linux) |