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

Commit 00299f50 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11975806 from 29f1274c to 24Q3-release 

Change-Id: I839140d230064e3a427032bf28ee2fe3feb4560a
parents a3f74e70 29f1274c

data/etc/android.hardware.telephony.satellite.xml

0 → 100644
+22 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2024 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.

  -->



<!-- This is the standard set of features for devices to support Telephony Satellite API. -->

<permissions>

    <feature name="android.hardware.telephony" />

    <feature name="android.hardware.telephony.satellite" />

</permissions>
 
 No newline at end of file

libs/binder/Android.bp

+0 −3
Original line number Diff line number Diff line
@@ -889,7 +889,4 @@ cc_binary { 
        "libutils",

        "android.debug_aidl-cpp",

    ],

    static_libs: [

        "libc++fs",

    ],

}

libs/binder/trusty/binderRpcTest/rules.mk

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ MODULE := $(LOCAL_DIR) 
MANIFEST := $(LOCAL_DIR)/manifest.json



MODULE_SRCS += \

	$(FMTLIB_DIR)/src/format.cc \

	$(LIBBINDER_TESTS_DIR)/binderRpcUniversalTests.cpp \

	$(LIBBINDER_TESTS_DIR)/binderRpcTestCommon.cpp \

	$(LIBBINDER_TESTS_DIR)/binderRpcTestTrusty.cpp \

libs/binder/trusty/binderRpcTest/service/rules.mk

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ MODULE := $(LOCAL_DIR) 
MANIFEST := $(LOCAL_DIR)/manifest.json



MODULE_SRCS := \

	$(FMTLIB_DIR)/src/format.cc \

	$(LIBBINDER_TESTS_DIR)/binderRpcTestCommon.cpp \

	$(LIBBINDER_TESTS_DIR)/binderRpcTestServiceTrusty.cpp \

libs/binder/trusty/kernel/rules.mk

+0 −2
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ LIBBINDER_DIR := frameworks/native/libs/binder 
LIBBASE_DIR := system/libbase

LIBLOG_STUB_DIR := $(LIBBINDER_DIR)/liblog_stub

LIBUTILS_BINDER_DIR := system/core/libutils/binder

FMTLIB_DIR := external/fmtlib



MODULE_SRCS := \

	$(LOCAL_DIR)/../OS.cpp \
@@ -59,7 +58,6 @@ GLOBAL_INCLUDES += \ 
	$(LIBBINDER_DIR)/ndk/include_cpp \

	$(LIBBASE_DIR)/include \

	$(LIBUTILS_BINDER_DIR)/include \

	$(FMTLIB_DIR)/include \



GLOBAL_COMPILEFLAGS += \

	-DANDROID_BASE_UNIQUE_FD_DISABLE_IMPLICIT_CONVERSION \