aboutsummaryrefslogtreecommitdiffstats
path: root/edify
diff options
context:
space:
mode:
authorTao Bao2017-10-04 11:33:01 -0500
committerTao Bao2017-10-09 16:08:00 -0500
commite6f7f95d3493b47514a6104e11d206a455a6433e (patch)
tree69a455f8598c31d11fa55a50975fdafef98ce93b /edify
parent1fc5bf353a8719d16fd9ba29a661d211bad4038f (diff)
downloadplatform-bootable-recovery-e6f7f95d3493b47514a6104e11d206a455a6433e.tar.gz
platform-bootable-recovery-e6f7f95d3493b47514a6104e11d206a455a6433e.tar.xz
platform-bootable-recovery-e6f7f95d3493b47514a6104e11d206a455a6433e.zip
edify: Export the header and move to Soong.
Also make matching changes to applypatch modules which include edify/expr.h. Test: mmma bootable/recovery Change-Id: Ia72be3caa010d7f56a70add2da345e631b306378
Diffstat (limited to 'edify')
-rw-r--r--edify/Android.bp45
-rw-r--r--edify/Android.mk53
-rw-r--r--edify/expr.cpp2
-rw-r--r--edify/include/edify/expr.h (renamed from edify/expr.h)0
-rw-r--r--edify/lexer.ll2
-rw-r--r--edify/parser.yy2
6 files changed, 48 insertions, 56 deletions
diff --git a/edify/Android.bp b/edify/Android.bp
new file mode 100644
index 00000000..42947eb4
--- /dev/null
+++ b/edify/Android.bp
@@ -0,0 +1,45 @@
1// Copyright (C) 2017 The Android Open Source Project
2//
3// Licensed under the Apache License, Version 2.0 (the "License");
4// you may not use this file except in compliance with the License.
5// You may obtain a copy of the License at
6//
7// http://www.apache.org/licenses/LICENSE-2.0
8//
9// Unless required by applicable law or agreed to in writing, software
10// distributed under the License is distributed on an "AS IS" BASIS,
11// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12// See the License for the specific language governing permissions and
13// limitations under the License.
14
15cc_library_static {
16 name: "libedify",
17
18 host_supported: true,
19
20 srcs: [
21 "expr.cpp",
22 "lexer.ll",
23 "parser.yy",
24 ],
25
26 cflags: [
27 "-Wall",
28 "-Werror",
29 "-Wno-deprecated-register",
30 "-Wno-unused-parameter",
31 ],
32
33 export_include_dirs: [
34 "include",
35 ],
36
37 local_include_dirs: [
38 "include",
39 ],
40
41 static_libs: [
42 "libbase",
43 "libotautil",
44 ],
45}
diff --git a/edify/Android.mk b/edify/Android.mk
deleted file mode 100644
index 527698e6..00000000
--- a/edify/Android.mk
+++ /dev/null
@@ -1,53 +0,0 @@
1# Copyright 2009 The Android Open Source Project
2#
3# Licensed under the Apache License, Version 2.0 (the "License");
4# you may not use this file except in compliance with the License.
5# You may obtain a copy of the License at
6#
7# http://www.apache.org/licenses/LICENSE-2.0
8#
9# Unless required by applicable law or agreed to in writing, software
10# distributed under the License is distributed on an "AS IS" BASIS,
11# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12# See the License for the specific language governing permissions and
13# limitations under the License.
14
15LOCAL_PATH := $(call my-dir)
16
17edify_src_files := \
18 lexer.ll \
19 parser.yy \
20 expr.cpp
21
22#
23# Build the device-side library (static library)
24#
25include $(CLEAR_VARS)
26
27LOCAL_SRC_FILES := $(edify_src_files)
28
29LOCAL_CFLAGS := -Wall -Werror
30LOCAL_CPPFLAGS := -Wno-unused-parameter
31LOCAL_CPPFLAGS += -Wno-deprecated-register
32LOCAL_MODULE := libedify
33LOCAL_STATIC_LIBRARIES += \
34 libotautil \
35 libbase
36
37include $(BUILD_STATIC_LIBRARY)
38
39#
40# Build the host-side library (static library)
41#
42include $(CLEAR_VARS)
43
44LOCAL_SRC_FILES := $(edify_src_files)
45
46LOCAL_CFLAGS := -Wall -Werror
47LOCAL_CPPFLAGS := -Wno-unused-parameter
48LOCAL_CPPFLAGS += -Wno-deprecated-register
49LOCAL_MODULE := libedify
50LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
51LOCAL_STATIC_LIBRARIES += libbase
52
53include $(BUILD_HOST_STATIC_LIBRARY)
diff --git a/edify/expr.cpp b/edify/expr.cpp
index 104c0fd9..1b8623f0 100644
--- a/edify/expr.cpp
+++ b/edify/expr.cpp
@@ -14,7 +14,7 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17#include "expr.h" 17#include "edify/expr.h"
18 18
19#include <stdarg.h> 19#include <stdarg.h>
20#include <stdio.h> 20#include <stdio.h>
diff --git a/edify/expr.h b/edify/include/edify/expr.h
index 770d1cf0..770d1cf0 100644
--- a/edify/expr.h
+++ b/edify/include/edify/expr.h
diff --git a/edify/lexer.ll b/edify/lexer.ll
index cb459437..4e04003b 100644
--- a/edify/lexer.ll
+++ b/edify/lexer.ll
@@ -18,7 +18,7 @@
18#include <string.h> 18#include <string.h>
19#include <string> 19#include <string>
20 20
21#include "expr.h" 21#include "edify/expr.h"
22#include "yydefs.h" 22#include "yydefs.h"
23#include "parser.h" 23#include "parser.h"
24 24
diff --git a/edify/parser.yy b/edify/parser.yy
index b1685eb1..bd2e0105 100644
--- a/edify/parser.yy
+++ b/edify/parser.yy
@@ -25,7 +25,7 @@
25 25
26#include <android-base/macros.h> 26#include <android-base/macros.h>
27 27
28#include "expr.h" 28#include "edify/expr.h"
29#include "yydefs.h" 29#include "yydefs.h"
30#include "parser.h" 30#include "parser.h"
31 31