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

Commit 7f0a256a authored by Sasha Smundak's avatar Sasha Smundak Committed by android-build-merger
Browse files

Merge "Convert Android.mk file to Android.bp" 

am: e6bcf626

Change-Id: I960027bd43c94d6d9908b83a1a13bffab8973549
parents ecb28c19 e6bcf626

keystore/tests/Android.bp

0 → 100644
+23 −0
Original line number Diff line number Diff line 
// 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.



android_test {

    name: "KeystoreTests",

    // LOCAL_MODULE := keystore

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

    static_libs: ["android-support-test"],

    platform_apis: true,

    libs: ["android.test.runner"],

    certificate: "platform",

}

keystore/tests/Android.mk

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



LOCAL_PATH := $(call my-dir)

include $(CLEAR_VARS)



# LOCAL_MODULE := keystore

LOCAL_MODULE_TAGS := tests



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



LOCAL_STATIC_JAVA_LIBRARIES := \

    android-support-test



LOCAL_PACKAGE_NAME := KeystoreTests

LOCAL_PRIVATE_PLATFORM_APIS := true



LOCAL_JAVA_LIBRARIES := android.test.runner



LOCAL_CERTIFICATE := platform



include $(BUILD_PACKAGE)

location/Android.mk

deleted100644 → 0
+0 −17
Original line number Diff line number Diff line 
# Copyright (C) 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 $(call all-subdir-makefiles, $(LOCAL_PATH))
 
 No newline at end of file

location/tests/Android.bp

0 → 100644
+1 −0
Original line number Diff line number Diff line

location/tests/Android.mk

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



include $(call all-makefiles-under, $(LOCAL_PATH))
 
 No newline at end of file