Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4889b8c authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "libbinder: use pragma once" am: 590a5a7f am: ea4a8fa7 am: aabfebd8 am: e61a0411 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1495196

Change-Id: Ibe82184a936a6d83529bbc17170d27025679487e
parents 351776d4 e61a0411

libs/binder/include/binder/ActivityManager.h

+1 −4
Original line number Diff line number Diff line
@@ -14,8 +14,7 @@ 
 * limitations under the License.

 */



#ifndef ANDROID_ACTIVITY_MANAGER_H

#define ANDROID_ACTIVITY_MANAGER_H

#pragma once



#ifndef __ANDROID_VNDK__
@@ -99,5 +98,3 @@ private: 
#else // __ANDROID_VNDK__

#error "This header is not visible to vendors"

#endif // __ANDROID_VNDK__
 


#endif // ANDROID_ACTIVITY_MANAGER_H

libs/binder/include/binder/AppOpsManager.h

+1 −4
Original line number Diff line number Diff line
@@ -14,8 +14,7 @@ 
 * limitations under the License.

 */



#ifndef ANDROID_APP_OPS_MANAGER_H

#define ANDROID_APP_OPS_MANAGER_H

#pragma once



#include <binder/IAppOpsService.h>
@@ -179,5 +178,3 @@ private: 
} // namespace android



// ---------------------------------------------------------------------------
 


#endif // ANDROID_APP_OPS_MANAGER_H

libs/binder/include/binder/Binder.h

+1 −4
Original line number Diff line number Diff line
@@ -14,8 +14,7 @@ 
 * limitations under the License.

 */



#ifndef ANDROID_BINDER_H

#define ANDROID_BINDER_H

#pragma once



#include <atomic>

#include <stdint.h>
@@ -142,5 +141,3 @@ private: 
} // namespace android



// ---------------------------------------------------------------------------
 


#endif // ANDROID_BINDER_H

libs/binder/include/binder/BinderService.h

+1 −3
Original line number Diff line number Diff line
@@ -14,8 +14,7 @@ 
 * limitations under the License.

 */



#ifndef ANDROID_BINDER_SERVICE_H

#define ANDROID_BINDER_SERVICE_H

#pragma once



#include <stdint.h>
@@ -64,4 +63,3 @@ private: 


} // namespace android

// ---------------------------------------------------------------------------
 
#endif // ANDROID_BINDER_SERVICE_H

libs/binder/include/binder/BpBinder.h

+1 −4
Original line number Diff line number Diff line
@@ -14,8 +14,7 @@ 
 * limitations under the License.

 */



#ifndef ANDROID_BPBINDER_H

#define ANDROID_BPBINDER_H

#pragma once



#include <binder/IBinder.h>

#include <utils/KeyedVector.h>
@@ -153,5 +152,3 @@ private: 
} // namespace android



// ---------------------------------------------------------------------------
 


#endif // ANDROID_BPBINDER_H