am 743b376b: Merge change 8804 into donut
Merge commit '743b376b363f85b6109828e5c33857316d263468' * commit '743b376b363f85b6109828e5c33857316d263468': Fix SDK build break caused by including legacy support header into main API header
This commit is contained in:
committed by
Android Git Automerger
commit
29bbe87153
@@ -22,8 +22,6 @@
|
||||
as types, structures, and constants definitions used in the API.
|
||||
*/
|
||||
|
||||
#include "adb_api_legacy.h"
|
||||
|
||||
// Enables compillation for "straight" C
|
||||
#ifdef __cplusplus
|
||||
#define EXTERN_C extern "C"
|
||||
|
||||
@@ -21,6 +21,7 @@
|
||||
|
||||
#include "stdafx.h"
|
||||
#include "adb_api.h"
|
||||
#include "adb_api_legacy.h"
|
||||
#include "adb_helper_routines.h"
|
||||
#include "adb_interface_enum.h"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user