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

Commit f11bd40c authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge changes If9daee8f,I09ab3bfc,I854760bd am: 32553d9b am: eb0e201c 

am: f0fbc8ac

Change-Id: Ibc1decb43140f850cffec48eef022c9c1d108b2d
parents bcf7d888 f0fbc8ac

Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -17,4 +17,6 @@ ndk_headers { 
subdirs = [

    "camera/ndk",

    "media/*",

    "radio",

    "soundtrigger",

]

media/img_utils/Android.bp

0 → 100644
+60 −0
Original line number Diff line number Diff line 
// Copyright 2014 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_shared {

    name: "libimg_utils",



    srcs: [

        "src/EndianUtils.cpp",

        "src/FileInput.cpp",

        "src/FileOutput.cpp",

        "src/SortedEntryVector.cpp",

        "src/Input.cpp",

        "src/Output.cpp",

        "src/Orderable.cpp",

        "src/TiffIfd.cpp",

        "src/TiffWritable.cpp",

        "src/TiffWriter.cpp",

        "src/TiffEntry.cpp",

        "src/TiffEntryImpl.cpp",

        "src/ByteArrayOutput.cpp",

        "src/DngUtils.cpp",

        "src/StripSource.cpp",

    ],



    shared_libs: [

        "liblog",

        "libutils",

        "libcutils",

    ],



    cflags: [

        "-Wall",

        "-Wextra",

        "-Werror",

        "-fvisibility=hidden",

    ],



    product_variables: {

        debuggable: {

            // Enable assert() in eng builds

            cflags: [

                "-UNDEBUG",

                "-DLOG_NDEBUG=1",

            ],

        },

    },



    export_include_dirs: ["include"],

}

media/img_utils/Android.mk

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



include $(call all-subdir-makefiles)

media/img_utils/src/Android.mk

deleted100644 → 0
+0 −60
Original line number Diff line number Diff line 
# Copyright 2014 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 := \

  EndianUtils.cpp \

  FileInput.cpp \

  FileOutput.cpp \

  SortedEntryVector.cpp \

  Input.cpp \

  Output.cpp \

  Orderable.cpp \

  TiffIfd.cpp \

  TiffWritable.cpp \

  TiffWriter.cpp \

  TiffEntry.cpp \

  TiffEntryImpl.cpp \

  ByteArrayOutput.cpp \

  DngUtils.cpp \

  StripSource.cpp \



LOCAL_SHARED_LIBRARIES := \

  liblog \

  libutils \

  libcutils \



LOCAL_C_INCLUDES += \

  $(LOCAL_PATH)/../include \

  system/media/camera/include



LOCAL_CFLAGS += \

  -Wall \

  -Wextra \

  -Werror \

  -fvisibility=hidden



ifneq ($(filter userdebug eng,$(TARGET_BUILD_VARIANT)),)

    # Enable assert() in eng builds

    LOCAL_CFLAGS += -UNDEBUG -DLOG_NDEBUG=1

endif



LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/../include



LOCAL_MODULE := libimg_utils



include $(BUILD_SHARED_LIBRARY)

radio/Android.bp

0 → 100644
+37 −0
Original line number Diff line number Diff line 
// Copyright 2014 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_shared {

    name: "libradio",



    srcs: [

        "Radio.cpp",

        "IRadio.cpp",

        "IRadioClient.cpp",

        "IRadioService.cpp",

    ],



    shared_libs: [

        "libcutils",

        "libutils",

        "liblog",

        "libbinder",

        "libradio_metadata",

    ],



    cflags: [

        "-Werror",

        "-Wall",

    ],

}