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

Commit e416f707 authored by Steven Moreland's avatar Steven Moreland Committed by Gerrit Code Review
Browse files

Merge changes I9b41e78f,Ia66e5da5 

* changes:
  liblshal: make static
  lshal: use pragma once
parents 80b4d0a4 b8745de5

cmds/lshal/Android.bp

+7 −4
Original line number Original line Diff line number Diff line
@@ -12,7 +12,7 @@ 
// See the License for the specific language governing permissions and

// See the License for the specific language governing permissions and

// limitations under the License.

// limitations under the License.





cc_library_shared {

cc_library_static {

    name: "liblshal",

    name: "liblshal",

    shared_libs: [

    shared_libs: [

        "libbase",

        "libbase",
@@ -47,13 +47,16 @@ cc_defaults { 
    name: "lshal_defaults",

    name: "lshal_defaults",

    shared_libs: [

    shared_libs: [

        "libbase",

        "libbase",

        "libcutils",

        "libutils",

        "libhidlbase",

        "libhidlbase",

        "libhidl-gen-utils",

        "libhidltransport",

        "libhidltransport",

        "liblshal",

        "libhidl-gen-hash",

        "libutils",

        "libhidl-gen-utils",

        "libvintf",

    ],

    ],

    static_libs: [

    static_libs: [

        "liblshal",

        "libprocpartition",

        "libprocpartition",

    ],

    ],

    cflags: ["-Wall", "-Werror"],

    cflags: ["-Wall", "-Werror"],

cmds/lshal/Command.h

+1 −4
Original line number Original line Diff line number Diff line
@@ -14,8 +14,7 @@ 
 * limitations under the License.

 * limitations under the License.

 */

 */





#ifndef FRAMEWORK_NATIVE_CMDS_LSHAL_COMMAND_H_

#pragma once

#define FRAMEWORK_NATIVE_CMDS_LSHAL_COMMAND_H_





#include "utils.h"

#include "utils.h"
@@ -48,5 +47,3 @@ protected: 




}  // namespace lshal

}  // namespace lshal

}  // namespace android
 
}  // namespace android
 


#endif  // FRAMEWORK_NATIVE_CMDS_LSHAL_LIST_COMMAND_H_

cmds/lshal/DebugCommand.h

+1 −4
Original line number Original line Diff line number Diff line
@@ -14,8 +14,7 @@ 
 * limitations under the License.

 * limitations under the License.

 */

 */





#ifndef FRAMEWORK_NATIVE_CMDS_LSHAL_DEBUG_COMMAND_H_

#pragma once

#define FRAMEWORK_NATIVE_CMDS_LSHAL_DEBUG_COMMAND_H_





#include <string>

#include <string>
@@ -53,5 +52,3 @@ private: 




}  // namespace lshal

}  // namespace lshal

}  // namespace android
 
}  // namespace android
 


#endif  // FRAMEWORK_NATIVE_CMDS_LSHAL_DEBUG_COMMAND_H_

cmds/lshal/HelpCommand.h

+1 −4
Original line number Original line Diff line number Diff line
@@ -14,8 +14,7 @@ 
 * limitations under the License.

 * limitations under the License.

 */

 */





#ifndef FRAMEWORK_NATIVE_CMDS_LSHAL_HELP_COMMAND_H_

#pragma once

#define FRAMEWORK_NATIVE_CMDS_LSHAL_HELP_COMMAND_H_





#include <string>

#include <string>
@@ -44,5 +43,3 @@ public: 




}  // namespace lshal

}  // namespace lshal

}  // namespace android
 
}  // namespace android
 


#endif  // FRAMEWORK_NATIVE_CMDS_LSHAL_HELP_COMMAND_H_

cmds/lshal/ListCommand.h

+1 −4
Original line number Original line Diff line number Diff line
@@ -14,8 +14,7 @@ 
 * limitations under the License.

 * limitations under the License.

 */

 */





#ifndef FRAMEWORK_NATIVE_CMDS_LSHAL_LIST_COMMAND_H_

#pragma once

#define FRAMEWORK_NATIVE_CMDS_LSHAL_LIST_COMMAND_H_





#include <getopt.h>

#include <getopt.h>

#include <stdint.h>

#include <stdint.h>
@@ -206,5 +205,3 @@ private: 




}  // namespace lshal

}  // namespace lshal

}  // namespace android
 
}  // namespace android
 


#endif  // FRAMEWORK_NATIVE_CMDS_LSHAL_LIST_COMMAND_H_