Merge "Remove full paths from abi_diff.proto"

vndk/tools/header-checker/Android.bp

@@ -39,36 +39,6 @@ cc_defaults {
     },
 }
 
-cc_library_host_static {
-    name: "libheader-checker-proto",
-
-    srcs: [
-        "proto/abi_dump.proto",
-        "proto/abi_diff.proto",
-    ],
-
-    proto: {
-        export_proto_headers: true,
-        type: "full",
-    },
-
-    cflags: [
-        "-Wall",
-        "-Werror",
-        "-Wcast-qual",
-        "-Wno-long-long",
-        "-Wno-unused-parameter",
-    ],
-
-    export_include_dirs: ["."],
-
-    target: {
-        windows: {
-            enabled: false,
-        },
-    },
-}
-
 cc_binary_host {
     name: "header-abi-dumper",
 

vndk/tools/header-checker/header-abi-util/include/ir_representation_protobuf.h

@@ -19,8 +19,8 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunused-parameter"
 #pragma clang diagnostic ignored "-Wnested-anon-types"
-#include "proto/abi_dump.pb.h"
-#include "proto/abi_diff.pb.h"
+#include "abi_dump.pb.h"
+#include "abi_diff.pb.h"
 #pragma clang diagnostic pop
 
 #include <google/protobuf/text_format.h>

vndk/tools/header-checker/header-abi-util/src/ir_representation.cpp

@@ -19,7 +19,7 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunused-parameter"
 #pragma clang diagnostic ignored "-Wnested-anon-types"
-#include "proto/abi_dump.pb.h"
+#include "abi_dump.pb.h"
 #pragma clang diagnostic pop
 
 #include <google/protobuf/text_format.h>

vndk/tools/header-checker/merge-abi-diff/src/merge_abi_diff.cpp

@@ -15,8 +15,8 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunused-parameter"
 #pragma clang diagnostic ignored "-Wnested-anon-types"
-#include "proto/abi_dump.pb.h"
-#include "proto/abi_diff.pb.h"
+#include "abi_dump.pb.h"
+#include "abi_diff.pb.h"
 #pragma clang diagnostic pop
 
 #include <header_abi_util.h>

vndk/tools/header-checker/proto/Android.bp

@@ -0,0 +1,46 @@
+//
+// Copyright (C) 2018 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_host_static {
+    name: "libheader-checker-proto",
+
+    srcs: [
+        "abi_dump.proto",
+        "abi_diff.proto",
+    ],
+
+    proto: {
+        export_proto_headers: true,
+        type: "full",
+        canonical_path_from_root: false,
+    },
+
+    cflags: [
+        "-Wall",
+        "-Werror",
+        "-Wcast-qual",
+        "-Wno-long-long",
+        "-Wno-unused-parameter",
+    ],
+
+    export_include_dirs: ["."],
+
+    target: {
+        windows: {
+            enabled: false,
+        },
+    },
+}

vndk/tools/header-checker/proto/abi_diff.proto

@@ -1,6 +1,6 @@
 syntax = "proto2";
 
-import "development/vndk/tools/header-checker/proto/abi_dump.proto";
+import "abi_dump.proto";
 
 package abi_diff;