Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc7ba9e6 authored by Colin Cross's avatar Colin Cross
Browse files

Convert legacy-test, test-runner, and test-mock to Android.bp 

See build/soong/README.md for more information.

Test: m checkbuild
Change-Id: I110f752d2fa94c44581f20d4f308d9d429da0517
Merged-In: I110f752d2fa94c44581f20d4f308d9d429da0517
(cherry-picked from commit 2b7d71c7)
parent c1613089

legacy-test/Android.bp

0 → 100644
+68 −0
Original line number Original line Diff line number Diff line 
//

// Copyright (C) 2016 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.

//



// Build the legacy-test library

// =============================

// This contains the junit.framework and android.test classes that were in

// Android API level 25 excluding those from android.test.runner.

// Also contains the com.android.internal.util.Predicate[s] classes.

java_library {

    name: "legacy-test",



    srcs: ["src/**/*.java"],



    no_framework_libs: true,

    libs: [

        "framework",

    ],



}



// Build the repackaged-legacy-test library

// ========================================

// This contains repackaged versions of the classes from legacy-test.

java_library_static {

    name: "repackaged-legacy-test",



    static_libs: ["legacy-test"],



    jarjar_rules: "jarjar-rules.txt",

}



// Build the legacy-android-test library

// =====================================

// This contains the android.test classes that were in Android API level 25,

// including those from android.test.runner.

// Also contains the com.android.internal.util.Predicate[s] classes.

java_library_static {

    name: "legacy-android-test",



    srcs: [

        "src/android/**/*.java",

        "src/com/**/*.java",

    ],



    static_libs: [

        "android.test.runner",

        "android.test.mock",

    ],



    no_framework_libs: true,

    libs: [

        "framework",

        "junit",

    ],

}

legacy-test/Android.mk

+0 −47
Original line number Original line Diff line number Diff line
@@ -16,35 +16,6 @@ 




LOCAL_PATH:= $(call my-dir)

LOCAL_PATH:= $(call my-dir)





# Build the legacy-test library

# =============================

# This contains the junit.framework and android.test classes that were in

# Android API level 25 excluding those from android.test.runner.

# Also contains the com.android.internal.util.Predicate[s] classes.

include $(CLEAR_VARS)



LOCAL_SRC_FILES := $(call all-java-files-under, src)



LOCAL_MODULE := legacy-test

LOCAL_NO_STANDARD_LIBRARIES := true

LOCAL_JAVA_LIBRARIES := core-oj core-libart framework



include $(BUILD_JAVA_LIBRARY)



# Build the repackaged-legacy-test library

# ========================================

# This contains repackaged versions of the classes from legacy-test.

include $(CLEAR_VARS)



LOCAL_SRC_FILES := $(call all-java-files-under, src)



LOCAL_MODULE := repackaged-legacy-test

LOCAL_NO_STANDARD_LIBRARIES := true

LOCAL_JAVA_LIBRARIES := core-oj core-libart framework

LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt



include $(BUILD_STATIC_JAVA_LIBRARY)



# Generate the stub source files for legacy.test.stubs

# Generate the stub source files for legacy.test.stubs

# ====================================================

# ====================================================

include $(CLEAR_VARS)

include $(CLEAR_VARS)
@@ -134,24 +105,6 @@ update-legacy-test-api: $(LEGACY_TEST_OUTPUT_API_FILE) | $(ACP) 
	@echo Copying removed.txt

	@echo Copying removed.txt

	$(hide) $(ACP) $(LEGACY_TEST_OUTPUT_REMOVED_API_FILE) $(LEGACY_TEST_REMOVED_API_FILE)

	$(hide) $(ACP) $(LEGACY_TEST_OUTPUT_REMOVED_API_FILE) $(LEGACY_TEST_REMOVED_API_FILE)





# Build the legacy-android-test library

# =====================================

# This contains the android.test classes that were in Android API level 25,

# including those from android.test.runner.

# Also contains the com.android.internal.util.Predicate[s] classes.

include $(CLEAR_VARS)



LOCAL_SRC_FILES := \

    $(call all-java-files-under, src/android) \

    $(call all-java-files-under, ../test-runner/src/android) \

    $(call all-java-files-under, ../test-mock/src/android) \

    $(call all-java-files-under, src/com)

LOCAL_MODULE := legacy-android-test

LOCAL_NO_STANDARD_LIBRARIES := true

LOCAL_JAVA_LIBRARIES := core-oj core-libart framework junit



include $(BUILD_STATIC_JAVA_LIBRARY)



ifeq ($(HOST_OS),linux)

ifeq ($(HOST_OS),linux)

# Build the legacy-performance-test-hostdex library

# Build the legacy-performance-test-hostdex library

# =================================================

# =================================================

test-mock/Android.bp

0 → 100644
+39 −0
Original line number Original line Diff line number Diff line 
//

// Copyright (C) 2008 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.

//



// Build the android.test.mock library

// ===================================

java_library {

    name: "android.test.mock",



    srcs: ["src/**/*.java"],



    no_framework_libs: true,

    libs: [

        "framework",

        "legacy-test",

    ],

}



// Build the repackaged.android.test.mock library

// ==============================================

java_library_static {

    name: "repackaged.android.test.mock",



    static_libs: ["android.test.mock"],



    jarjar_rules: "jarjar-rules.txt",

}

test-mock/Android.mk

+0 −26
Original line number Original line Diff line number Diff line
@@ -18,32 +18,6 @@ LOCAL_PATH:= $(call my-dir) 




android_test_mock_source_files := $(call all-java-files-under, src/android/test/mock)

android_test_mock_source_files := $(call all-java-files-under, src/android/test/mock)





# Build the repackaged.android.test.mock library

# ==============================================

include $(CLEAR_VARS)



LOCAL_SRC_FILES := $(call all-java-files-under, src)



LOCAL_JAVA_LIBRARIES := core-oj core-libart framework legacy-test



LOCAL_JARJAR_RULES := $(LOCAL_PATH)/../legacy-test/jarjar-rules.txt



LOCAL_MODULE:= repackaged.android.test.mock



include $(BUILD_STATIC_JAVA_LIBRARY)



# Build the android.test.mock library

# ===================================

include $(CLEAR_VARS)



LOCAL_SRC_FILES := $(call all-java-files-under, src)



LOCAL_JAVA_LIBRARIES := core-oj core-libart framework



LOCAL_MODULE:= android.test.mock



include $(BUILD_JAVA_LIBRARY)



# Generate the stub source files for android.test.mock.stubs

# Generate the stub source files for android.test.mock.stubs

# ==========================================================

# ==========================================================

include $(CLEAR_VARS)

include $(CLEAR_VARS)

test-mock/jarjar-rules.txt

0 → 120000
+1 −0
Original line number Original line Diff line number Diff line 
../legacy-test/jarjar-rules.txt
 
 No newline at end of file