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

Commit e42cfef5 authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge \"Convert more Android.mk files to Android.bp\" 

am: 4c06cd86

Change-Id: If16db842b2a10ee328b2a8e30e12aeb0a5611e05
parents dab2cd94 4c06cd86

adf/Android.bp

0 → 100644
+1 −0
Original line number Diff line number Diff line 
subdirs = ["*"]

adf/Android.mk

deleted100644 → 0
+0 −18
Original line number Diff line number Diff line 
#

# Copyright (C) 2013 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 := $(my-dir)



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

adf/libadf/Android.bp

0 → 100644
+21 −0
Original line number Diff line number Diff line 
// Copyright (C) 2013 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.



cc_library_static {

    name: "libadf",

    srcs: ["adf.c"],

    cflags: ["-Werror"],

    local_include_dirs: ["include"],

    export_include_dirs: ["include"],

}

adf/libadf/Android.mk

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
# Copyright (C) 2013 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_SRC_FILES := adf.c

LOCAL_MODULE := libadf

LOCAL_MODULE_TAGS := optional

LOCAL_CFLAGS += -Werror

LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include

LOCAL_C_INCLUDES += $(LOCAL_EXPORT_C_INCLUDE_DIRS)

include $(BUILD_STATIC_LIBRARY)

adf/libadf/tests/Android.bp

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

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

//



cc_test {

    name: "adf-unit-tests",

    srcs: ["adf_test.cpp"],

    static_libs: ["libadf"],

    cflags: ["-Werror"],

}