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

Commit c3613f45 authored by Paul Duffin's avatar Paul Duffin
Browse files

Convert preload2 from .mk to .bp

Allows removal of dependency on apache-harmony-jdwp-tests-host.

Test: m preload2 preload-tool
Bug: 134379140
Change-Id: Idb75a7d4d4d27354511f9ff08194c2e738605f56
parent 5578077a
Loading
Loading
Loading
Loading
+50 −0
Original line number Diff line number Diff line
// Copyright (C) 2015 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.

java_library_host {
    name: "preload2",

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

    // To connect to devices (and take hprof dumps).
    static_libs: [
        "ddmlib-prebuilt",
        "tools-common-prebuilt",

        // To process hprof dumps.
        "perflib-prebuilt",

        "trove-prebuilt",
        "guavalib",

        // For JDWP access we use the framework in the JDWP tests from Apache Harmony, for
        // convenience (and to not depend on internal JDK APIs).
        "apache-harmony-jdwp-tests",
        "junit",
    ],

    // Copy to build artifacts
    dist: {
        targets: [
            "dist_files",
        ],
    },
}

// Copy the preload-tool shell script to the host's bin directory.
sh_binary_host {
    name: "preload-tool",
    src: "preload-tool",
    required: ["preload2"],
}

tools/preload2/Android.mk

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

include $(CLEAR_VARS)

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

# To connect to devices (and take hprof dumps).
LOCAL_STATIC_JAVA_LIBRARIES := ddmlib-prebuilt tools-common-prebuilt

# To process hprof dumps.
LOCAL_STATIC_JAVA_LIBRARIES += perflib-prebuilt trove-prebuilt guavalib

# For JDWP access we use the framework in the JDWP tests from Apache Harmony, for
# convenience (and to not depend on internal JDK APIs).
LOCAL_STATIC_JAVA_LIBRARIES += apache-harmony-jdwp-tests-host junit-host

LOCAL_MODULE:= preload2

include $(BUILD_HOST_JAVA_LIBRARY)
# Copy to build artifacts
$(call dist-for-goals,dist_files,$(LOCAL_BUILT_MODULE):$(LOCAL_MODULE).jar)

# Copy the preload-tool shell script to the host's bin directory.
include $(CLEAR_VARS)
LOCAL_IS_HOST_MODULE := true
LOCAL_MODULE_CLASS := EXECUTABLES
LOCAL_MODULE := preload-tool
LOCAL_SRC_FILES := preload-tool
LOCAL_REQUIRED_MODULES := preload2
include $(BUILD_PREBUILT)