diff options
| -rw-r--r-- | Android.bp | 1 | ||||
| -rw-r--r-- | Android.mk | 1 | ||||
| -rw-r--r-- | applypatch/Android.mk | 1 | ||||
| -rw-r--r-- | edify/Android.bp | 45 | ||||
| -rw-r--r-- | edify/Android.mk | 53 | ||||
| -rw-r--r-- | edify/expr.cpp | 2 | ||||
| -rw-r--r-- | edify/include/edify/expr.h (renamed from edify/expr.h) | 0 | ||||
| -rw-r--r-- | edify/lexer.ll | 2 | ||||
| -rw-r--r-- | edify/parser.yy | 2 |
9 files changed, 50 insertions, 57 deletions
diff --git a/Android.bp b/Android.bp index 99ca3a45c..4c66c427e 100644 --- a/Android.bp +++ b/Android.bp @@ -1,5 +1,6 @@ subdirs = [ "bootloader_message", + "edify", "otafault", "otautil", ] diff --git a/Android.mk b/Android.mk index ac72bac01..b40e23dc4 100644 --- a/Android.mk +++ b/Android.mk @@ -261,7 +261,6 @@ include $(BUILD_STATIC_LIBRARY) include \ $(LOCAL_PATH)/applypatch/Android.mk \ $(LOCAL_PATH)/boot_control/Android.mk \ - $(LOCAL_PATH)/edify/Android.mk \ $(LOCAL_PATH)/minadbd/Android.mk \ $(LOCAL_PATH)/minui/Android.mk \ $(LOCAL_PATH)/tests/Android.mk \ diff --git a/applypatch/Android.mk b/applypatch/Android.mk index 4eb0111df..05d937004 100644 --- a/applypatch/Android.mk +++ b/applypatch/Android.mk @@ -29,6 +29,7 @@ LOCAL_C_INCLUDES := \ bootable/recovery LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include LOCAL_STATIC_LIBRARIES := \ + libedify \ libotafault \ libbase \ libcrypto \ diff --git a/edify/Android.bp b/edify/Android.bp new file mode 100644 index 000000000..42947eb4e --- /dev/null +++ b/edify/Android.bp @@ -0,0 +1,45 @@ +// Copyright (C) 2017 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_static { + name: "libedify", + + host_supported: true, + + srcs: [ + "expr.cpp", + "lexer.ll", + "parser.yy", + ], + + cflags: [ + "-Wall", + "-Werror", + "-Wno-deprecated-register", + "-Wno-unused-parameter", + ], + + export_include_dirs: [ + "include", + ], + + local_include_dirs: [ + "include", + ], + + static_libs: [ + "libbase", + "libotautil", + ], +} diff --git a/edify/Android.mk b/edify/Android.mk deleted file mode 100644 index 527698e68..000000000 --- a/edify/Android.mk +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 2009 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) - -edify_src_files := \ - lexer.ll \ - parser.yy \ - expr.cpp - -# -# Build the device-side library (static library) -# -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(edify_src_files) - -LOCAL_CFLAGS := -Wall -Werror -LOCAL_CPPFLAGS := -Wno-unused-parameter -LOCAL_CPPFLAGS += -Wno-deprecated-register -LOCAL_MODULE := libedify -LOCAL_STATIC_LIBRARIES += \ - libotautil \ - libbase - -include $(BUILD_STATIC_LIBRARY) - -# -# Build the host-side library (static library) -# -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(edify_src_files) - -LOCAL_CFLAGS := -Wall -Werror -LOCAL_CPPFLAGS := -Wno-unused-parameter -LOCAL_CPPFLAGS += -Wno-deprecated-register -LOCAL_MODULE := libedify -LOCAL_C_INCLUDES += $(LOCAL_PATH)/.. -LOCAL_STATIC_LIBRARIES += libbase - -include $(BUILD_HOST_STATIC_LIBRARY) diff --git a/edify/expr.cpp b/edify/expr.cpp index 104c0fd90..1b8623f03 100644 --- a/edify/expr.cpp +++ b/edify/expr.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "expr.h" +#include "edify/expr.h" #include <stdarg.h> #include <stdio.h> diff --git a/edify/expr.h b/edify/include/edify/expr.h index 770d1cf0d..770d1cf0d 100644 --- a/edify/expr.h +++ b/edify/include/edify/expr.h diff --git a/edify/lexer.ll b/edify/lexer.ll index cb4594371..4e04003b1 100644 --- a/edify/lexer.ll +++ b/edify/lexer.ll @@ -18,7 +18,7 @@ #include <string.h> #include <string> -#include "expr.h" +#include "edify/expr.h" #include "yydefs.h" #include "parser.h" diff --git a/edify/parser.yy b/edify/parser.yy index b1685eb1f..bd2e0105f 100644 --- a/edify/parser.yy +++ b/edify/parser.yy @@ -25,7 +25,7 @@ #include <android-base/macros.h> -#include "expr.h" +#include "edify/expr.h" #include "yydefs.h" #include "parser.h" |