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

Commit 83f68031 authored by Bill Rassieur's avatar Bill Rassieur
Browse files

Merge master@5428150 into git_qt-dev-plus-aosp. 

Change-Id: I0fc600be488d62a10022a4e63298beef3a57a22d
BUG: 129345239
parents fc1aaa92 32fa5079

Android.bp

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
subdirs = [

    "camera",

    "drm/*",

    "media/*",

    "services/*",

    "soundtrigger",

]

apex/ld.config.txt

+2 −0
Original line number Diff line number Diff line
@@ -49,6 +49,8 @@ namespace.default.links = platform 
# namespace.default.link.platform.shared_libs  = %LLNDK_LIBRARIES%

# namespace.default.link.platform.shared_libs += %SANITIZER_RUNTIME_LIBRARIES%

namespace.default.link.platform.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libc.so:libclang_rt.asan-aarch64-android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-aarch64-android.so:libclang_rt.asan-i686-android.so:libclang_rt.asan-x86_64-android.so:libdl.so:libft2.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so

# FIXME: b/129552044

namespace.default.link.platform.shared_libs += libz.so



###############################################################################

# "platform" namespace

apex/manifest.json

+1 −1
Original line number Diff line number Diff line 
{

  "name": "com.android.media",

  "version": 1

  "version": 200000000

}

apex/manifest_codec.json

+1 −1
Original line number Diff line number Diff line 
{

  "name": "com.android.media.swcodec",

  "version": 1

  "version": 200000000

}

camera/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -12,8 +12,6 @@ 
// See the License for the specific language governing permissions and

// limitations under the License.



subdirs = ["ndk"]



cc_library_shared {

    name: "libcamera_client",