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

Commit ed92902c authored by Orion Hodson's avatar Orion Hodson Committed by Automerger Merge Worker
Browse files

Merge "Add explicit dependencies on jni_headers" am: c0fe0ae2 am: 6963d8e1...

Merge "Add explicit dependencies on jni_headers" am: c0fe0ae2 am: 6963d8e1 am: 18f7afcc am: 98d4cf41

Change-Id: I35faf4a712ac2c0de758d6c15a771d5ac159410d
parents f4ce1e3d 98d4cf41
Loading
Loading
Loading
Loading
+2 −0
Original line number Original line Diff line number Diff line
@@ -28,6 +28,8 @@ cc_binary {
    name: "bootanimation",
    name: "bootanimation",
    defaults: ["bootanimation_defaults"],
    defaults: ["bootanimation_defaults"],


    header_libs: ["jni_headers"],

    shared_libs: [
    shared_libs: [
        "libOpenSLES",
        "libOpenSLES",
        "libbootanimation",
        "libbootanimation",
+2 −1
Original line number Original line Diff line number Diff line
@@ -14,6 +14,7 @@


cc_library_shared {
cc_library_shared {
    name: "libmemoryintarraytest",
    name: "libmemoryintarraytest",
    header_libs: ["jni_headers"],
    shared_libs: [
    shared_libs: [
        "libcutils",
        "libcutils",
    ],
    ],
+0 −2
Original line number Original line Diff line number Diff line
@@ -16,8 +16,6 @@


#include "PathParser.h"
#include "PathParser.h"


#include "jni.h"

#include <errno.h>
#include <errno.h>
#include <stdlib.h>
#include <stdlib.h>
#include <utils/Log.h>
#include <utils/Log.h>
+0 −1
Original line number Original line Diff line number Diff line
@@ -22,7 +22,6 @@


#include <android/log.h>
#include <android/log.h>
#include <cutils/compiler.h>
#include <cutils/compiler.h>
#include <jni.h>


#include <string>
#include <string>


+2 −0
Original line number Original line Diff line number Diff line
@@ -65,6 +65,8 @@ cc_library_static {
        "-Wno-unused-parameter",
        "-Wno-unused-parameter",
    ],
    ],


    header_libs: ["jni_headers"],

    shared_libs: [
    shared_libs: [
        "libmedia",
        "libmedia",
        "libgui",
        "libgui",
Loading