commit f35e179b7805fc417e518eb4425bd3646527ed96
author Andreas Gampe <agampe@google.com> Mon Apr 01 15:58:03 2019 -0700
committer Andreas Gampe <agampe@google.com> Tue Apr 02 10:45:36 2019 -0700
tree c61ed0987ad339b046a971ff8f929d9ded35802b
parent 6e13ff8d9f8531de4de7ae79573f2c07c6a3e9c4

Apexd: Remove dependencies on apexd.h

Remove or replace apexd.h with apex_constants.h where possible.

Bug: 129709670
Test: mmma system/apex/apexd
Change-Id: Ibcb41c653e2df2741b752eea2ae7cc90ebb06c6f

apexd/apex_file_test.cpp

diff --git a/apexd/apex_file_test.cpp b/apexd/apex_file_test.cpp
index 7716c8d..d6c7fe0 100644
--- a/apexd/apex_file_test.cpp
+++ b/apexd/apex_file_test.cpp
@@ -25,7 +25,6 @@
 
 #include "apex_file.h"
 #include "apex_key.h"
-#include "apexd.h"
 
 static std::string testDataDir = android::base::GetExecutableDirectory() + "/";
 

apexd/apexd_session.cpp

diff --git a/apexd/apexd_session.cpp b/apexd/apexd_session.cpp
index f5db424..0ce9b15 100644
--- a/apexd/apexd_session.cpp
+++ b/apexd/apexd_session.cpp
@@ -15,8 +15,7 @@
  */
 
 #include "apexd_session.h"
-#include "apexd.h"
-#include "apexd_private.h"
+
 #include "apexd_utils.h"
 #include "status_or.h"
 #include "string_log.h"

apexd/apexd_session.h

diff --git a/apexd/apexd_session.h b/apexd/apexd_session.h
index adff938..5f32198 100644
--- a/apexd/apexd_session.h
+++ b/apexd/apexd_session.h
@@ -17,7 +17,7 @@
 #ifndef ANDROID_APEXD_APEXD_SESSION_H_
 #define ANDROID_APEXD_APEXD_SESSION_H_
 
-#include "apexd.h"
+#include "apex_constants.h"
 #include "status_or.h"
 
 #include "session_state.pb.h"

apexd/apexservice_test.cpp

diff --git a/apexd/apexservice_test.cpp b/apexd/apexservice_test.cpp
index 60b9e61..f1f15dc 100644
--- a/apexd/apexservice_test.cpp
+++ b/apexd/apexservice_test.cpp
@@ -45,6 +45,7 @@
 #include <android/apex/ApexInfo.h>
 #include <android/apex/IApexService.h>
 
+#include "apex_constants.h"
 #include "apex_file.h"
 #include "apex_manifest.h"
 #include "apexd_private.h"