Merge "Always define sdk_addon as phony"
diff --git a/core/tasks/sdk-addon.mk b/core/tasks/sdk-addon.mk
index 93fea4e..122161b 100644
--- a/core/tasks/sdk-addon.mk
+++ b/core/tasks/sdk-addon.mk
@@ -12,10 +12,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-ifndef ONE_SHOT_MAKEFILE
-
.PHONY: sdk_addon
+ifndef ONE_SHOT_MAKEFILE
+
# If they didn't define PRODUCT_SDK_ADDON_NAME, then we won't define
# any of these rules.
addon_name := $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SDK_ADDON_NAME))