Skip to content

Commit

Permalink
MA-15263-1 convert Android.mk to Android.bp
Browse files Browse the repository at this point in the history
convert all the Android.mk to Android.bp under vendor/nxp-opensource/fsl_imx_demo
remove "LOCAL_SDK_VERSION := current" in some apks for build error

no need to add resource_dirs: ["res"]

Change-Id: I85f67c3f92e4a38be42f8c72616ba93bce356440
Signed-off-by: dandan.sun <[email protected]>
Reviewed-on: http://androidsource.ap.freescale.net/project/9713
Reviewed-by: zhang sanshan <[email protected]>
  • Loading branch information
dandan.sun committed Aug 15, 2019
1 parent fa27dc6 commit dca3848
Show file tree
Hide file tree
Showing 19 changed files with 270 additions and 137 deletions.
15 changes: 15 additions & 0 deletions Android.bp
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
// Copyright 2019 NXP
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

subdirs = ["*"]
2 changes: 0 additions & 2 deletions Android.mk

This file was deleted.

20 changes: 20 additions & 0 deletions AudioRoute/Android.bp
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// Copyright 2019 NXP
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

// This is the NXP AudioRoute APP for i.MX.

android_app {
name: "AudioRoute",
srcs: ["src/**/*.java"],
}
15 changes: 0 additions & 15 deletions AudioRoute/Android.mk

This file was deleted.

22 changes: 22 additions & 0 deletions AudioTimeStampTest/Android.bp
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// Copyright 2019 NXP
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

// This is the NXP AudioTimeStampTest APP for i.MX.

android_app {
name: "AudioTimeStampTest",
srcs: ["com/**/*.java"],
sdk_version: "current",
certificate: "platform",
}
15 changes: 0 additions & 15 deletions AudioTimeStampTest/Android.mk

This file was deleted.

24 changes: 24 additions & 0 deletions DirectAudioPlayer/Android.bp
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
// Copyright 2019 NXP
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

// This is the NXP DirectAudioPlayer APP for i.MX.

android_app {
name: "DirectAudioPlayer",
srcs: ["java/**/*.java"],
sdk_version: "current",
certificate: "platform",
product_specific: true,
static_libs: ["android-support-v4"],
}
17 changes: 0 additions & 17 deletions DirectAudioPlayer/Android.mk

This file was deleted.

45 changes: 45 additions & 0 deletions Ethernet/Android.bp
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
// Copyright 2019 NXP
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

// This is the NXP ethernet APP for i.MX.

ethernet_defaults {
name: "ethernet_default",
}

android_app {
name: "ethernet",
defaults: ["ethernet_default"],
srcs: ["com/**/*.java"],
product_specific: true,
platform_apis: true,
certificate: "platform",
}

bootstrap_go_package {
name: "soong-ethernet",
pkgPath: "android/soong/vendor/nxp-opensource/fsl_imx_demo/Ethernet",
deps: [
"blueprint",
"blueprint-pathtools",
"soong",
"soong-android",
"soong-cc",
"soong-genrule",
],
srcs: [
"ethernet.go",
],
pluginFor: ["soong_build"],
}
21 changes: 0 additions & 21 deletions Ethernet/Android.mk

This file was deleted.

49 changes: 49 additions & 0 deletions Ethernet/ethernet.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
// Copyright 2019 NXP
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package ethernet

import (
"android/soong/android"
"android/soong/cc"
"github.com/google/blueprint/proptools"
)

func init() {
android.RegisterModuleType("ethernet_defaults", ethernetDefaultsFactory)
}

func ethernetDefaultsFactory() (android.Module) {
module := cc.DefaultsFactory()
android.AddLoadHook(module, ethernetDefaults)
return module
}

func ethernetDefaults(ctx android.LoadHookContext) {
type props struct {
Target struct {
Android struct {
Enabled *bool
}
}
}

p := &props{}
if ctx.Config().VendorConfig("IMXPLUGIN").String("PRODUCT_MANUFACTURER") == "freescale" {
p.Target.Android.Enabled = proptools.BoolPtr(true)
} else {
p.Target.Android.Enabled = proptools.BoolPtr(false)
}
ctx.AppendProperties(p)
}
23 changes: 23 additions & 0 deletions FSLOta/Android.bp
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// Copyright 2019 NXP
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

// This is the NXP FSLOta APP for i.MX.

android_app {
name: "FSLOta",
srcs: ["src/**/*.java"],
platform_apis: true,
privileged: true,
product_specific: true,
}
14 changes: 0 additions & 14 deletions FSLOta/Android.mk

This file was deleted.

20 changes: 20 additions & 0 deletions HdmiDualVideo/Android.bp
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// Copyright 2019 NXP
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

// This is the NXP HdmiDualPlayback APP for i.MX.

android_app {
name: "HdmiDualPlayback",
srcs: ["src/**/*.java"],
}
14 changes: 0 additions & 14 deletions HdmiDualVideo/Android.mk

This file was deleted.

31 changes: 31 additions & 0 deletions SleepAwakeAutoTest/Android.bp
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
// Copyright 2019 NXP
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

// This is the NXP SleepAwakeAutoTest APP for i.MX.

subdirs = ["frameworks/opt/setupwizard/navigationbar/common.mk"]

android_app {
name: "SleepAwakeAutoTest",
static_libs: [
"android-support-v4",
"android-support-v13",
"jsr305",
],
srcs: ["src/**/*.java"],
resource_dirs: ["res"],
sdk_version: "current",
certificate: "platform",
privileged: true,
}
25 changes: 0 additions & 25 deletions SleepAwakeAutoTest/Android.mk

This file was deleted.

Loading

0 comments on commit dca3848

Please sign in to comment.