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

Commit 31754eb5 authored by Sasha Smundak's avatar Sasha Smundak
Browse files

Convert Android.mk file to Android.bp 

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

Bug: 122332340
Test: treehugger
Change-Id: I52416790e1e4493dd4fe57404095351b8d37ea22
parent 3b988d17

test-runner/Android.mk

deleted100644 → 0
+0 −20
Original line number 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.

#



LOCAL_PATH:= $(call my-dir)



# additionally, build unit tests in a separate .apk

include $(call all-makefiles-under,$(LOCAL_PATH))

test-runner/tests/Android.bp

0 → 100644
+40 −0
Original line number Diff line number Diff line 
// Copyright 2010, 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.



android_test {

    name: "FrameworkTestRunnerTests",



    // We only want this apk build for tests.

    //

    // Run the tests using the following commands:

    //   adb install -r ${ANDROID_PRODUCT_OUT}/data/app/FrameworkTestRunnerTests/FrameworkTestRunnerTests.apk

    //   adb shell am instrument \

    //     -e notAnnotation android.test.suitebuilder.examples.error.RunAsPartOfSeparateTest \

    //     -w com.android.frameworks.testrunner.tests/android.test.InstrumentationTestRunner \

    //



    libs: [

        "android.test.runner",

        "android.test.base",

        "android.test.mock",

    ],

    static_libs: ["junit"],



    // Include all test java files.

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



    // Because of android.test.mock.

    platform_apis: true,



}

test-runner/tests/Android.mk

deleted100644 → 0
+0 −39
Original line number Diff line number Diff line 
# Copyright 2010, 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)

include $(CLEAR_VARS)



# We only want this apk build for tests.

#

# Run the tests using the following commands:

#   adb install -r ${ANDROID_PRODUCT_OUT}/data/app/FrameworkTestRunnerTests/FrameworkTestRunnerTests.apk

#   adb shell am instrument \

        -e notAnnotation android.test.suitebuilder.examples.error.RunAsPartOfSeparateTest \

        -w com.android.frameworks.testrunner.tests/android.test.InstrumentationTestRunner

#

LOCAL_MODULE_TAGS := tests



LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base android.test.mock

LOCAL_STATIC_JAVA_LIBRARIES := junit



# Include all test java files.

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



LOCAL_PACKAGE_NAME := FrameworkTestRunnerTests

# Because of android.test.mock.

LOCAL_PRIVATE_PLATFORM_APIS := true



include $(BUILD_PACKAGE)

tools/preload/Android.bp

0 → 100644
+17 −0
Original line number Diff line number Diff line 
java_library_host {

    name: "preload",

    srcs: [

        "Compile.java",

        "LoadedClass.java",

        "MemoryUsage.java",

        "Operation.java",

        "Policy.java",

        "PrintCsv.java",

        "PrintHtmlDiff.java",

        "PrintPsTree.java",

        "Proc.java",

        "Record.java",

        "Root.java",

        "WritePreloadedClassFile.java",

    ],

}

tools/preload/Android.mk

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
LOCAL_PATH:= $(call my-dir)



include $(CLEAR_VARS)



LOCAL_SRC_FILES := \

	Compile.java  \

	LoadedClass.java \

	MemoryUsage.java \

	Operation.java \

	Policy.java \

	PrintCsv.java \

	PrintHtmlDiff.java \

	PrintPsTree.java \

	Proc.java \

	Record.java \

	Root.java \

	WritePreloadedClassFile.java



LOCAL_MODULE:= preload



include $(BUILD_HOST_JAVA_LIBRARY)



include $(call all-makefiles-under,$(LOCAL_PATH))