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

Commit c3f5a118 authored Sep 24, 2020 by Ken Chen

Add build flag on platform dependent change

The commit a9b79dd7 is a platform dependent change. Its external
dependencies does not merge to R. Firstly, mainline modules are built
from internal branch which stay in Android R. Secondly, we want module
code in AOSP (S on going) and internal branch for mainline modules are
synchronized. Thus, it needs a build flag to satisfy both branches.

Bug: 168163123
Test: build pass on aosp and mainline release branch
Change-Id: I5c1cf56fe2bd35afecdad0a3005f5c34b2246acf

parent b32cab38

tests/dns_metrics_listener/base_metrics_listener.cpp

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -45,7 +45,12 @@ namespace metrics {

	::ndk::ScopedAStatus BaseMetricsListener::onWakeupEvent(		::ndk::ScopedAStatus BaseMetricsListener::onWakeupEvent(
	const std::string& /prefix/, int32_t /uid/, int32_t /ethertype/,		const std::string& /prefix/, int32_t /uid/, int32_t /ethertype/,
			// TODO: remove build flag when mainline release branch migrates to Android S (b/168163123).
			#ifdef __ANDROID_API_S__
	int32_t /ipNextHeader/, const std::vector<uint8_t>& /dstHw/,		int32_t /ipNextHeader/, const std::vector<uint8_t>& /dstHw/,
			#else
			int32_t /ipNextHeader/, const std::vector<int8_t>& /dstHw/,
			#endif
	const std::string& /srcIp/, const std::string& /dstIp/, int32_t /srcPort/,		const std::string& /srcIp/, const std::string& /dstIp/, int32_t /srcPort/,
	int32_t /dstPort/, int64_t /timestampNs/) {		int32_t /dstPort/, int64_t /timestampNs/) {
	// default no-op		// default no-op

tests/dns_metrics_listener/base_metrics_listener.h

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -45,7 +45,12 @@ class BaseMetricsListener : public aidl::android::net::metrics::BnNetdEventListe
	int32_t /uid/) override;		int32_t /uid/) override;
	virtual ::ndk::ScopedAStatus onWakeupEvent(const std::string& /prefix/, int32_t /uid/,		virtual ::ndk::ScopedAStatus onWakeupEvent(const std::string& /prefix/, int32_t /uid/,
	int32_t /ethertype/, int32_t /ipNextHeader/,		int32_t /ethertype/, int32_t /ipNextHeader/,
			// TODO: remove build flag when mainline release branch migrates to Android S (b/168163123).
			#ifdef __ANDROID_API_S__
	const std::vector<uint8_t>& /dstHw/,		const std::vector<uint8_t>& /dstHw/,
			#else
			const std::vector<int8_t>& /dstHw/,
			#endif
	const std::string& /srcIp/,		const std::string& /srcIp/,
	const std::string& /dstIp/, int32_t /srcPort/,		const std::string& /dstIp/, int32_t /srcPort/,
	int32_t /dstPort/,		int32_t /dstPort/,